[10164] Update vmap_assembler to upcoming new implementation

* Note: vmap_assembler tool will not compile until final commit of new vmap system
* Now also comes with Visual Studio 2010 project files and CMake files

contrib/vmap_assembler/.gitignore

@@ -12,5 +12,13 @@
 
 *.ncb
 *.suo
-Release
+*.sdf
-Debug
+*.opensdf
+bin
+
+# CMake files
+
+CMakeFiles
+CMakeCache.txt
+cmake_install.cmake
+

contrib/vmap_assembler/CMakeLists.txt

@@ -0,0 +1,87 @@
+# Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
+#
+# 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)
+

contrib/vmap_assembler/VC100/.gitignore

@@ -0,0 +1,3 @@
+
+*.user
+bin

contrib/vmap_assembler/VC100/vmap_assembler.vcxproj

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{572FFF74-480C-4472-8ABF-81733BB4049D}</ProjectGuid>
+    <RootNamespace>vmap_assembler</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)vmap_assembler.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\vmap_assembler.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\BIH.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\MapTree.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\ModelInstance.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\TileAssembler.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\VMapManager2.cpp" />
+    <ClCompile Include="..\..\..\src\shared\vmap\WorldModel.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\shared\vmap\BIH.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\MapTree.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\ModelInstance.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\TileAssembler.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\VMapManager2.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\VMapTools.h" />
+    <ClInclude Include="..\..\..\src\shared\vmap\WorldModel.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\win\VC100\g3dlite.vcxproj">
+      <Project>{8072769e-cf10-48bf-b9e1-12752a5dac6e}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\win\VC100\zlib.vcxproj">
+      <Project>{8f1dea42-6a5b-4b62-839d-c141a7bfacf2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

contrib/vmap_assembler/VC80/.gitignore

@@ -11,3 +11,4 @@
 #
 
 *.user
+bin

contrib/vmap_assembler/VC80/vmap_assembler.vcproj

@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Debug"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="..\Debug\obj"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -96,8 +96,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\Release"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="..\Release\obj"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -190,67 +190,27 @@
 			Name="vmaplib"
 			>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\AABSPTree.h"
+				RelativePath="..\..\..\src\shared\vmap\BIH.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BaseModel.cpp"
+				RelativePath="..\..\..\src\shared\vmap\BIH.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BaseModel.h"
+				RelativePath="..\..\..\src\shared\vmap\MapTree.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\CoordModelMapping.cpp"
+				RelativePath="..\..\..\src\shared\vmap\MapTree.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\CoordModelMapping.h"
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\DebugCmdLogger.cpp"
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\DebugCmdLogger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\NodeValueAccess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortBox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortVector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.h"
 				>
 			</File>
 			<File
@@ -262,17 +222,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.cpp"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.h"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

contrib/vmap_assembler/VC90/.gitignore

@@ -11,3 +11,4 @@
 #
 
 *.user
+bin

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 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Debug"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="..\Debug\obj"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -41,8 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -64,7 +65,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/vmap_assembler.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb"
 				SubSystem="1"
@@ -96,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\Release"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
-			IntermediateDirectory="..\Release\obj"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -119,8 +121,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
@@ -189,67 +191,27 @@
 			Name="vmaplib"
 			>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\AABSPTree.h"
+				RelativePath="..\..\..\src\shared\vmap\BIH.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BaseModel.cpp"
+				RelativePath="..\..\..\src\shared\vmap\BIH.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\BaseModel.h"
+				RelativePath="..\..\..\src\shared\vmap\MapTree.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\CoordModelMapping.cpp"
+				RelativePath="..\..\..\src\shared\vmap\MapTree.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\CoordModelMapping.h"
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\DebugCmdLogger.cpp"
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\DebugCmdLogger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\NodeValueAccess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortBox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortVector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.h"
 				>
 			</File>
 			<File
@@ -261,17 +223,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.cpp"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.h"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

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;

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

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
+pause>nul

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
+pause

contrib/vmap_extract_assembler_bin/splitConfig.txt

@@ -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

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__