From 4d42cd9e1ae2fb21eab685647fdbea991d02e946 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Wed, 1 Apr 2009 21:34:55 +0400 Subject: [PATCH] [7596] Better use wmo MOPY flags data on extract vmaps. No changes, just speedup. Signed-off-by: DiSlord --- .../vmapextract_v2.exe | Bin 217088 -> 217088 bytes contrib/vmap_extractor_v2/vmapextract/wmo.cpp | 6 +++++- contrib/vmap_extractor_v2/vmapextract/wmo.h | 8 ++++++++ src/shared/revision_nr.h | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe b/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe index 03c76907658990e6657f372ace9b168868599de1..a1e982f0cba4c1f9e03853f24860d40430df3679 100644 GIT binary patch delta 21886 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 RY^8AuQHj3v9H+QR{|_E8k6Qo$ delta 22175 zcmd^ndt6ji`|n4PeF`WLYl5S`AHm?UpoL4?9X+S+4yK2r}>tM}cv+pQxsSu|U+ zZqn@Rwc&5OU3w({4r1AGCs+`wb*Opo0X7)e3w57ewRJ#jXGiX$fUre8Hx{|~pW5L;-Nsly9Q!<}sA@m%Kc4xCp0?5o zG{)1mYzv6$DB|U_0ZEc zKy|V3pr-H-l6&3LR=JEq^v|l>A$HDNidbE=s51&eAS(VxfoxGna+|>W&4EAY^zh@E zo@)F`DF$yH%ZiBZqiQ z>gG%sM=-edViXTtLrtp0m_`_5{OKXXA4#$Z(nf0)-`Ucjp!+nOa_sCss99Bp^^ zCuiA{)~YYcJkndEA?K_~`>%S;Jm<`Q`fSyhFMGNAj5y^?==ePXhqO|>n2ZkVd(yh3 zcDlz`Jdro$os-sUwRVr)C!O)PPgLDKgi}0TO;N3SR+(e>4ge zz__zU;RrDH94IjMC!??r2sv*Qs(`5%i~_xgvcQx}M&U9r`La>i++Y+8K*E2F!a1Px zZ$=@a5`PX{H3}=Q7==IoFbXf-Fbda!mzqI=*KQhxd%zpFjKY0@um9B%dO?tvR#%xD zr@IWh_=TXP9!r&O*0~-!ie5O1q`T3ghUB=X%1Qfq3)Rx$%!6tN9V!-wEm1rw0Ts zGID9LK_+?h9;^4Ceq@a`^v@u2-TM5Wqv#tOtQ-G)flmC)s=XUZ+i$SO-W7d5dCwsm zgF7QC3++9Uilw05aE1k}(v^M@#>+{lj6uIuX^etzRhYoF0*IU1C znMH#?u?F4?AhI?2UNJ5B)H?k^PYv(FEW25@s{dX}zpLbF){hbFyU{xQ{vfwTA1uZb z0@%eE;%hCw|1=68y8jM&V9k8chdi^4X z2F~11*E~zQlFMseC&TE@9cw-zL3GiMH5W-xm}!SHjE2@UUT{PCZ{&j=1)-?Mv$zAI zS!zp}SdRT82^o`-frMz$+l1J77DY%bImAi`Iqvh)Cn(z@ArC{+lx9iLm0-=4d+1n4 z7t(j&AY>z>Bw7qOTqN#?!1l#8Io-@PcB5dfz@Jo$S)FA_DG8Q0>|(W)tW=MW6a;b@pPCHSRbfL&mH+-g z5Sm;~GJA);z%x&<wyf8Lp_Pd^^i?CG*L9tl5=(OmDPf@4LbLFQl+DZlqU#-u9#{ zgGtWc#>Yy~dh)0WhlM-Lyi1WojiRZD7?MPp0`H+RRBRyviMK%{NA8`hFJ$5{D zI=Z@&z|5huO3*2SFnM}r;i1r4g?l}?3m19o>SBX<);uablV&#a@hX1EjiKROk43d- zHSI`%e$ZCMPP`lzfeBbrrdO=K>CVT8?w1M2n^@wMia@Sm7aK>ZB~SxrWQ@ z@5qkl1rkvp0vbl6C4%hPDk>VHWP+IV)>&tT1~JZ2qe*UD`9xwhmw1+~*AkzIuaK^2 z63UBLB8I_WEIbrkT=Qz@RFm{pG=_Q>HOXrf0XjvcN-m&iC2Q7_9=cf$3Gw1E)Fr2` zWIfuGjNUC4UY|~45h$M|TQ+gMxGa;r7~xcTW+{8GJsI3FTGV=`xd_Ligxj7SjhfnH z>|%Q|%X7RM)oNk0fJEs#`6*`VKn9TxEWZO8nBM@W=DbQ$71u0uJ?oN=qEd$FeWASx zA#Uafvy2≧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 Led(2;YNG!O1_2sR diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp index 9dfda6f77..a0deab1eb 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp @@ -315,7 +315,11 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData) IndexExTr = new int[mopy_size]; for (int i=0; i #include "mpq.h" +// MOPY flags +#define WMO_MATERIAL_NOCAMCOLLIDE 0x01 +#define WMO_MATERIAL_DETAIL 0x02 +#define WMO_MATERIAL_NO_COLLISION 0x04 +#define WMO_MATERIAL_HINT 0x08 +#define WMO_MATERIAL_RENDER 0x10 +#define WMO_MATERIAL_COLLIDE_HIT 0x20 +#define WMO_MATERIAL_WALL_SURFACE 0x40 class WMOInstance; class WMOManager; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c9ae4387f..d4a1adfb3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7595" + #define REVISION_NR "7596" #endif // __REVISION_NR_H__