HIGHLY EXPERIMENTAL - USE AT YOUR OWN RISK

Implement the use of the new vmap3-format by Lynx3d (mad props to you for this, and thanks for the talks earlier)
+ reduced Vmap size to less than one third, and improve precision
+ indoor/outdoor check which allows automatic unmounting of players
+ additional area information from WMOAreaTable.dbc, removed existing "hacks"
+ WMO liquid information for swimming and fishing correctly in buildings/cities/caves/instances (lava and slime WILL hurt from now on!)
- buildfiles for windows are not properly done, and will need to be sorted out
NOTE: Do NOT annoy Lynx3d about this, any issues with this "port" is entirely our fault !
THIS REVISION IS CONSIDERED UNSTABLE AND CONTAINS WORK IN PROGRESS - USE AT YOUR OWN RISK!

--HG--
branch : trunk

8 files changed, 785 insertions, 81 deletions

diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
new file mode 100644
index 00000000000..42c7817699f
--- /dev/null
+++ b/contrib/vmap_assembler/CMakeLists.txt
@@ -0,0 +1,85 @@
+# 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("-Wall")
+ADD_DEFINITIONS("-ggdb")
+ADD_DEFINITIONS("-O3")
+
+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/vmap_assembler.vcxproj b/contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
new file mode 100644
index 00000000000..e16f40b8e98
--- /dev/null
+++ b/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\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(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\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(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\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(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\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(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>
diff --git a/contrib/vmap_assembler/VC71/vmap_assembler.vcproj b/contrib/vmap_assembler/VC71/vmap_assembler.vcproj
index aaaeb4dfc3c..1c6d932bddf 100644
--- a/contrib/vmap_assembler/VC71/vmap_assembler.vcproj
+++ b/contrib/vmap_assembler/VC71/vmap_assembler.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Debug"
-			IntermediateDirectory="..\Debug\obj"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -61,8 +61,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\Release"
-			IntermediateDirectory="..\Release\obj"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/contrib/vmap_assembler/VC80/vmap_assembler.vcproj b/contrib/vmap_assembler/VC80/vmap_assembler.vcproj
index 3b3a58a05aa..f8f14285974 100644
--- a/contrib/vmap_assembler/VC80/vmap_assembler.vcproj
+++ b/contrib/vmap_assembler/VC80/vmap_assembler.vcproj
@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Debug"
-			IntermediateDirectory="..\Debug\obj"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			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"
-			IntermediateDirectory="..\Release\obj"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -190,167 +190,187 @@
 			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"
+				RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.cpp"
+				RelativePath="..\..\..\src\shared\vmap\TileAssembler.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ManagedModelContainer.h"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.cpp"
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ModelContainer.h"
+				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\NodeValueAccess.h"
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortBox.h"
+				RelativePath="..\..\..\src\shared\vmap\WorldModel.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="g3dlite"
+			>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\ShortVector.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\AABox.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Array.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\SubModel.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Box.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\CollisionDetection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TileAssembler.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\CoordinateFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Crypto.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\TreeNode.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\debug.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\shared\vmap\VMapTools.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\format.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="g3dlite"
-			>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\AABox.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\g3dmath.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\AABox.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\GCamera.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\AABSPTree.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Line.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Array.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Matrix3.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Box.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Plane.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Box.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\platform.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\CollisionDetection.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Quat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\CoordinateFrame.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Ray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Crypto.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\RegistryUtil.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Crypto.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Sphere.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\debug.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\stringutils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\format.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\System.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\format.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Table.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\g3dmath.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Triangle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\g3dmath.inl"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\GCamera.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector2int16.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Line.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector3.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Matrix3.cpp"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector3int16.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Matrix3.h"
+				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\AABox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Box.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Crypto.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\format.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Matrix3.cpp"
 				>
 			</File>
 			<File
@@ -358,95 +378,131 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Plane.h"
+				RelativePath="..\..\..\dep\src\g3dlite\System.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\platform.h"
+				RelativePath="..\..\..\dep\src\g3dlite\Triangle.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Quat.h"
+				RelativePath="..\..\..\dep\src\g3dlite\Vector3.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Quat.inl"
+				RelativePath="..\..\..\dep\src\g3dlite\Vector4.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Ray.h"
+				RelativePath="..\..\..\dep\src\g3dlite\debugAssert.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\RegistryUtil.h"
+				RelativePath="..\..\..\dep\src\g3dlite\fileutils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Sphere.h"
+				RelativePath="..\..\..\dep\src\g3dlite\g3dmath.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\stringutils.h"
+				RelativePath="..\..\..\dep\src\g3dlite\g3dfnmatch.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\System.cpp"
+				RelativePath="..\..\..\dep\src\g3dlite\prompt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\System.h"
+				RelativePath="..\..\..\dep\src\g3dlite\stringutils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Table.h"
+				RelativePath="..\..\..\dep\src\g3dlite\Any.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Triangle.cpp"
+				RelativePath="..\..\..\dep\src\g3dlite\BinaryFormat.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Triangle.h"
+				RelativePath="..\..\..\dep\src\g3dlite\BinaryInput.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector2.h"
+				RelativePath="..\..\..\dep\src\g3dlite\BinaryOutput.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector2.inl"
+				RelativePath="..\..\..\dep\src\g3dlite\Capsule.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector2int16.h"
+				RelativePath="..\..\..\dep\src\g3dlite\CollisionDetection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Vector3.cpp"
+				RelativePath="..\..\..\dep\src\g3dlite\CoordinateFrame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector3.h"
+				RelativePath="..\..\..\dep\src\g3dlite\Cylinder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector3.inl"
+				RelativePath="..\..\..\dep\src\g3dlite\Line.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector3int16.h"
+				RelativePath="..\..\..\dep\src\g3dlite\LineSegment.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\src\g3dlite\Vector4.cpp"
+				RelativePath="..\..\..\dep\src\g3dlite\Log.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector4.h"
+				RelativePath="..\..\..\dep\src\g3dlite\Matrix4.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\MemoryManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Quat.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Random.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Ray.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\ReferenceCount.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\Sphere.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\TextInput.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\TextOutput.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dep\src\g3dlite\UprightFrame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\dep\include\g3dlite\G3D\Vector4.inl"
+				RelativePath="..\..\..\dep\src\g3dlite\Vector2.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj
new file mode 100644
index 00000000000..aff990d01cc
--- /dev/null
+++ b/contrib/vmap_assembler/VC90/vmap_assembler.vcproj
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="vmap_assembler"
+	ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	RootNamespace="vmap_assembler"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/vmap_assembler.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/vmap_assembler.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\..\vmap_assembler.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="vmaplib"
+			>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\BIH.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\BIH.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\MapTree.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\MapTree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\ModelInstance.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\TileAssembler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp"
+				>
+			</File>
+			<File
+				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>
+	</Globals>
+</VisualStudioProject>
diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap_assembler/vmap_assembler.cpp
index e6a3089f328..6666b54356c 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;
@@ -118,4 +118,3 @@ int main(int argc, char* argv[])
     printf("Ok, all done\n");
     return 0;
 }
-
diff --git a/contrib/vmap_assembler/vmap_assemblerVC100.sln b/contrib/vmap_assembler/vmap_assemblerVC100.sln
new file mode 100644
index 00000000000..368858561f9
--- /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_assembler/vmap_assemblerVC90.sln b/contrib/vmap_assembler/vmap_assemblerVC90.sln
new file mode 100644
index 00000000000..9e94e750661
--- /dev/null
+++ b/contrib/vmap_assembler/vmap_assemblerVC90.sln
@@ -0,0 +1,42 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	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|Win32.ActiveCfg = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
+		{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|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{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|Win32.ActiveCfg = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal