diff --git a/contrib/vmap_assembler/.gitignore b/contrib/vmap_assembler/.gitignore index 267442f37..8aa88368a 100644 --- a/contrib/vmap_assembler/.gitignore +++ b/contrib/vmap_assembler/.gitignore @@ -12,5 +12,13 @@ *.ncb *.suo -Release -Debug +*.sdf +*.opensdf +bin + +# CMake files + +CMakeFiles +CMakeCache.txt +cmake_install.cmake + diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt new file mode 100644 index 000000000..413aec825 --- /dev/null +++ b/contrib/vmap_assembler/CMakeLists.txt @@ -0,0 +1,87 @@ +# Copyright (C) 2005-2009 MaNGOS project +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +cmake_minimum_required (VERSION 2.6) +project (MANGOS_VMAP_ASSEMB_IO) + +set(CMAKE_VERBOSE_MAKEFILE true) + +# uncomment next line to disable debug mode +ADD_DEFINITIONS("-DIOMAP_DEBUG") +ADD_DEFINITIONS("-DNO_CORE_FUNCS") + +ADD_DEFINITIONS("-Wall") +ADD_DEFINITIONS("-ggdb") +ADD_DEFINITIONS("-O3") + +include_directories(../../src/shared) +include_directories(../../src/shared/vmap/) +include_directories(../../dep/include/g3dlite/) +include_directories(../../dep/ACE_wrappers/) +include_directories(../../objdir/dep/ACE_wrappers) +include_directories(../../src/framework/) + +add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp + ../../dep/src/g3dlite/Box.cpp + ../../dep/src/g3dlite/Crypto.cpp + ../../dep/src/g3dlite/format.cpp + ../../dep/src/g3dlite/Matrix3.cpp + ../../dep/src/g3dlite/Plane.cpp + ../../dep/src/g3dlite/System.cpp + ../../dep/src/g3dlite/Triangle.cpp + ../../dep/src/g3dlite/Vector3.cpp + ../../dep/src/g3dlite/Vector4.cpp + ../../dep/src/g3dlite/debugAssert.cpp + ../../dep/src/g3dlite/fileutils.cpp + ../../dep/src/g3dlite/g3dmath.cpp + ../../dep/src/g3dlite/g3dfnmatch.cpp + ../../dep/src/g3dlite/prompt.cpp + ../../dep/src/g3dlite/stringutils.cpp + ../../dep/src/g3dlite/Any.cpp + ../../dep/src/g3dlite/BinaryFormat.cpp + ../../dep/src/g3dlite/BinaryInput.cpp + ../../dep/src/g3dlite/BinaryOutput.cpp + ../../dep/src/g3dlite/Capsule.cpp + ../../dep/src/g3dlite/CollisionDetection.cpp + ../../dep/src/g3dlite/CoordinateFrame.cpp + ../../dep/src/g3dlite/Cylinder.cpp + ../../dep/src/g3dlite/Line.cpp + ../../dep/src/g3dlite/LineSegment.cpp + ../../dep/src/g3dlite/Log.cpp + ../../dep/src/g3dlite/Matrix4.cpp + ../../dep/src/g3dlite/MemoryManager.cpp + ../../dep/src/g3dlite/Quat.cpp + ../../dep/src/g3dlite/Random.cpp + ../../dep/src/g3dlite/Ray.cpp + ../../dep/src/g3dlite/ReferenceCount.cpp + ../../dep/src/g3dlite/Sphere.cpp + ../../dep/src/g3dlite/TextInput.cpp + ../../dep/src/g3dlite/TextOutput.cpp + ../../dep/src/g3dlite/UprightFrame.cpp + ../../dep/src/g3dlite/Vector2.cpp + ) + +add_library(vmap + ../../src/shared/vmap/BIH.cpp + ../../src/shared/vmap/VMapManager2.cpp + ../../src/shared/vmap/MapTree.cpp + ../../src/shared/vmap/TileAssembler.cpp + ../../src/shared/vmap/WorldModel.cpp + ../../src/shared/vmap/ModelInstance.cpp + ) + +target_link_libraries(vmap g3dlite z) + +add_executable(vmap_assembler vmap_assembler.cpp) +target_link_libraries(vmap_assembler vmap) + +# add_executable(vmap_test coordinate_test.cpp) +# target_link_libraries(vmap_test vmap) + diff --git a/contrib/vmap_assembler/VC100/.gitignore b/contrib/vmap_assembler/VC100/.gitignore new file mode 100644 index 000000000..384744b68 --- /dev/null +++ b/contrib/vmap_assembler/VC100/.gitignore @@ -0,0 +1,3 @@ + +*.user +bin \ No newline at end of file diff --git a/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj b/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj new file mode 100644 index 000000000..91a600ba2 --- /dev/null +++ b/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj @@ -0,0 +1,214 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {572FFF74-480C-4472-8ABF-81733BB4049D} + vmap_assembler + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\bin\$(Platform)_$(Configuration)\ + ..\bin\$(Platform)_$(Configuration)\ + .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ + .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ + false + false + ..\bin\$(Platform)_$(Configuration)\ + ..\bin\$(Platform)_$(Configuration)\ + .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ + .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ + false + false + + + + Disabled + ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + StreamingSIMDExtensions + + + Level3 + ProgramDatabase + + + $(OutDir)vmap_assembler.exe + + + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + %(AdditionalDependencies) + true + true + + + + + + + Disabled + ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + StreamingSIMDExtensions + + + Level3 + ProgramDatabase + + + $(OutDir)vmap_assembler.exe + + + true + $(OutDir)$(TargetName).pdb + Console + false + + + %(AdditionalDependencies) + true + true + + + + + ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) + MultiThreadedDLL + StreamingSIMDExtensions + + + Level3 + ProgramDatabase + + + $(OutDir)vmap_assembler.exe + false + Console + true + true + false + + + MachineX86 + + + + + ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) + MultiThreadedDLL + StreamingSIMDExtensions + + + Level3 + ProgramDatabase + + + $(OutDir)vmap_assembler.exe + false + Console + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + {8072769e-cf10-48bf-b9e1-12752a5dac6e} + false + + + {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} + false + + + + + + diff --git a/contrib/vmap_assembler/VC80/.gitignore b/contrib/vmap_assembler/VC80/.gitignore index 7835e14b5..494fd0b9d 100644 --- a/contrib/vmap_assembler/VC80/.gitignore +++ b/contrib/vmap_assembler/VC80/.gitignore @@ -11,3 +11,4 @@ # *.user +bin \ No newline at end of file diff --git a/contrib/vmap_assembler/VC80/vmap_assembler.vcproj b/contrib/vmap_assembler/VC80/vmap_assembler.vcproj index a5db6bbd8..d0dddd4be 100644 --- a/contrib/vmap_assembler/VC80/vmap_assembler.vcproj +++ b/contrib/vmap_assembler/VC80/vmap_assembler.vcproj @@ -16,8 +16,8 @@ - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/contrib/vmap_assembler/VC90/.gitignore b/contrib/vmap_assembler/VC90/.gitignore index 7835e14b5..494fd0b9d 100644 --- a/contrib/vmap_assembler/VC90/.gitignore +++ b/contrib/vmap_assembler/VC90/.gitignore @@ -11,3 +11,4 @@ # *.user +bin \ No newline at end of file diff --git a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj index 2b695f51d..aec6ffafa 100644 --- a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj +++ b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj @@ -4,6 +4,7 @@ Version="9.00" Name="vmap_assembler" ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}" + RootNamespace="vmap_assembler" Keyword="Win32Proj" TargetFrameworkVersion="131072" > @@ -17,8 +18,8 @@ - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap_assembler/vmap_assembler.cpp index 7da98b599..6666b5435 100644 --- a/contrib/vmap_assembler/vmap_assembler.cpp +++ b/contrib/vmap_assembler/vmap_assembler.cpp @@ -54,7 +54,7 @@ File contains map names that should be split into tiles A '#' at the beginning of a line defines a comment */ -bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa) +/* bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa) { bool result = false; char buffer[501]; @@ -74,7 +74,7 @@ bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa) result = true; } return(result); -} +} */ //======================================================= int main(int argc, char* argv[]) { @@ -97,7 +97,7 @@ int main(int argc, char* argv[]) All the names in the list are considered to be world maps or huge instances. These maps will be spilt into tiles in the vmap assemble process */ - if(conffile != NULL) + /* if(conffile != NULL) { if(!readConfigFile(conffile, ta)) { @@ -105,9 +105,9 @@ int main(int argc, char* argv[]) delete ta; return 1; } - } + } */ - if(!ta->convertWorld()) + if(!ta->convertWorld2()) { printf("exit with errors\n"); delete ta; diff --git a/contrib/vmap_assembler/vmap_assemblerVC100.sln b/contrib/vmap_assembler/vmap_assemblerVC100.sln new file mode 100644 index 000000000..368858561 --- /dev/null +++ b/contrib/vmap_assembler/vmap_assemblerVC100.sln @@ -0,0 +1,59 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC100\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_NoPCH|Win32 = Debug_NoPCH|Win32 + Debug_NoPCH|x64 = Debug_NoPCH|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.ActiveCfg = Debug|x64 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.Build.0 = Debug|x64 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.ActiveCfg = Debug|x64 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.Build.0 = Debug|x64 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.ActiveCfg = Release|x64 + {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.Build.0 = Release|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/contrib/vmap_extract_assembler_bin/make vmaps.bat b/contrib/vmap_extract_assembler_bin/make vmaps.bat index cb6714f4c..7ff13ad46 100644 --- a/contrib/vmap_extract_assembler_bin/make vmaps.bat +++ b/contrib/vmap_extract_assembler_bin/make vmaps.bat @@ -14,7 +14,7 @@ IF EXIST buildings\dir (ECHO The buildings folder already exist do you want to d echo If YES hit Enter to continue if no CLOSE the program now! . . . pause>nul DEL /S /Q buildings) -vmapextract_v2.exe +vmapExtractor3.exe cls echo. echo. @@ -29,7 +29,7 @@ echo. echo Vmaps extracted check log.txt for errors, now it's time to assemble the vmaps press any key to continue . . . pause>nul md vmaps -vmap_assembler.exe buildings vmaps splitConfig.txt +vmap_assembler.exe buildings vmaps cls echo. echo. @@ -43,4 +43,4 @@ echo. echo. echo Process done! copy vmaps folder to the MaNGOS main directory echo Press any key to exit . . . -pause>nul \ No newline at end of file +pause>nul diff --git a/contrib/vmap_extract_assembler_bin/makevmaps_SIMPLE.bat b/contrib/vmap_extract_assembler_bin/makevmaps_SIMPLE.bat index bf01c24ed..e938808c4 100644 --- a/contrib/vmap_extract_assembler_bin/makevmaps_SIMPLE.bat +++ b/contrib/vmap_extract_assembler_bin/makevmaps_SIMPLE.bat @@ -1,5 +1,5 @@ -vmapextract_v2.exe +vmapExtractor3.exe md vmaps -vmap_assembler.exe buildings vmaps splitConfig.txt +vmap_assembler.exe buildings vmaps -pause \ No newline at end of file +pause diff --git a/contrib/vmap_extract_assembler_bin/splitConfig.txt b/contrib/vmap_extract_assembler_bin/splitConfig.txt deleted file mode 100644 index 8d217b8e9..000000000 --- a/contrib/vmap_extract_assembler_bin/splitConfig.txt +++ /dev/null @@ -1,21 +0,0 @@ -# list of map names - -509 #AhnQiraj -469 #BlackwingLair -189 #MonasteryInstances -030 #PVPZone01 -037 #PVPZone02 -033 #Shadowfang -533 #Stratholme Raid -209 #TanarisInstance -309 #Zul'gurub -560 #HillsbradPast -534 #HyjalPast -532 #Karazahn -543 #HellfireRampart -568 #ZulAman -564 #BlackTemple -574 #UtgardeKeep -575 #UtgardePinnacle -609 #EbonHold -628 #IsleOfConquest \ No newline at end of file diff --git a/contrib/vmap_extract_assembler_bin/vmap_assembler.exe b/contrib/vmap_extract_assembler_bin/vmap_assembler.exe index 42f2eb404..f46b5e845 100644 Binary files a/contrib/vmap_extract_assembler_bin/vmap_assembler.exe and b/contrib/vmap_extract_assembler_bin/vmap_assembler.exe differ diff --git a/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe b/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe deleted file mode 100644 index 213705f6c..000000000 Binary files a/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe and /dev/null differ diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c78fbf752..a6edd71c5 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 "10163" + #define REVISION_NR "10164" #endif // __REVISION_NR_H__