From a4a418a679f1ac760a8763edd856f0178cfc6dde Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Fri, 25 May 2012 07:18:52 +0000
Subject: Merged the composable_generator branch into the trunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2010/MCServer.vcxproj         | 24 ++++++-----
 VC2010/MCServer.vcxproj.filters | 92 ++++++++++++++++++++---------------------
 2 files changed, 57 insertions(+), 59 deletions(-)

(limited to 'VC2010')

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index ca7323f31..279bf347c 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -302,6 +302,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\source\BioGen.cpp" />
+    <ClCompile Include="..\source\BlockID.cpp" />
     <ClCompile Include="..\source\cAggressiveMonster.cpp" />
     <ClCompile Include="..\Source\cAuthenticator.cpp" />
     <ClCompile Include="..\source\cBlockingTCPLink.cpp" />
@@ -324,7 +326,6 @@
     <ClCompile Include="..\source\cFurnaceEntity.cpp" />
     <ClCompile Include="..\Source\cFurnaceRecipe.cpp" />
     <ClCompile Include="..\source\cFurnaceWindow.cpp" />
-    <ClCompile Include="..\source\cGenSettings.cpp" />
     <ClCompile Include="..\source\cGhast.cpp" />
     <ClCompile Include="..\Source\cGroup.cpp" />
     <ClCompile Include="..\Source\cGroupManager.cpp" />
@@ -347,6 +348,7 @@
       <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">Default</BasicRuntimeChecks>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\source\CompoGen.cpp" />
     <ClCompile Include="..\source\cPassiveAggressiveMonster.cpp" />
     <ClCompile Include="..\source\cPassiveMonster.cpp" />
     <ClCompile Include="..\Source\cPawn.cpp" />
@@ -386,16 +388,16 @@
     <ClCompile Include="..\source\cWebPlugin_Lua.cpp" />
     <ClCompile Include="..\source\cWindow.cpp" />
     <ClCompile Include="..\source\cWolf.cpp" />
-    <ClCompile Include="..\source\cWorldGenerator.cpp" />
-    <ClCompile Include="..\source\cWorldGenerator_Test.cpp" />
     <ClCompile Include="..\source\cZombie.cpp" />
     <ClCompile Include="..\source\cZombiepigman.cpp" />
+    <ClCompile Include="..\source\FinishGen.cpp" />
     <ClCompile Include="..\source\FastNBT.cpp" />
     <ClCompile Include="..\source\Globals.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\source\HeiGen.cpp" />
     <ClCompile Include="..\source\LeakFinder.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with optimized Noise|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
@@ -422,7 +424,6 @@
     <ClCompile Include="..\source\cLog.cpp" />
     <ClCompile Include="..\source\Bindings.cpp" />
     <ClCompile Include="..\source\main.cpp" />
-    <ClCompile Include="..\source\NBT.cpp" />
     <ClCompile Include="..\source\packets\cPacket.cpp" />
     <ClCompile Include="..\source\packets\cPacket_13.cpp" />
     <ClCompile Include="..\source\packets\cPacket_AddToInventory.cpp" />
@@ -480,15 +481,17 @@
     </ClCompile>
     <ClCompile Include="..\source\StringCompression.cpp" />
     <ClCompile Include="..\source\StringUtils.cpp" />
+    <ClCompile Include="..\source\StructGen.cpp" />
+    <ClCompile Include="..\source\Trees.cpp" />
     <ClCompile Include="..\source\Vector3d.cpp" />
     <ClCompile Include="..\source\Vector3f.cpp" />
     <ClCompile Include="..\source\Vector3i.cpp" />
-    <ClCompile Include="..\source\WGFlat.cpp" />
     <ClCompile Include="..\source\WorldStorage.cpp" />
     <ClCompile Include="..\source\WSSAnvil.cpp" />
     <ClCompile Include="..\source\WSSCompact.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\source\BioGen.h" />
     <ClInclude Include="..\Source\BlockID.h" />
     <ClInclude Include="..\source\cAggressiveMonster.h" />
     <ClInclude Include="..\Source\cAuthenticator.h" />
@@ -526,6 +529,7 @@
     <ClInclude Include="..\Source\cMonster.h" />
     <ClInclude Include="..\source\cMonsterConfig.h" />
     <ClInclude Include="..\source\cNoise.h" />
+    <ClInclude Include="..\source\CompoGen.h" />
     <ClInclude Include="..\source\cPassiveAggressiveMonster.h" />
     <ClInclude Include="..\source\cPassiveMonster.h" />
     <ClInclude Include="..\Source\cPawn.h" />
@@ -558,7 +562,6 @@
     <ClInclude Include="..\source\cStringMap.h" />
     <ClInclude Include="..\source\cSurvivalInventory.h" />
     <ClInclude Include="..\Source\cTCPLink.h" />
-    <ClInclude Include="..\source\cGenSettings.h" />
     <ClInclude Include="..\source\cThread.h" />
     <ClInclude Include="..\source\cTimer.h" />
     <ClInclude Include="..\source\cTorch.h" />
@@ -571,14 +574,14 @@
     <ClInclude Include="..\source\cWindow.h" />
     <ClInclude Include="..\source\cWindowOwner.h" />
     <ClInclude Include="..\source\cWolf.h" />
-    <ClInclude Include="..\source\cWorldGenerator.h" />
-    <ClInclude Include="..\source\cWorldGenerator_Test.h" />
     <ClInclude Include="..\source\cZombie.h" />
     <ClInclude Include="..\source\cZombiepigman.h" />
     <ClInclude Include="..\source\Endianness.h" />
     <ClInclude Include="..\source\FastNBT.h" />
     <ClInclude Include="..\Source\FileDefine.h" />
+    <ClInclude Include="..\source\FinishGen.h" />
     <ClInclude Include="..\source\Globals.h" />
+    <ClInclude Include="..\source\HeiGen.h" />
     <ClInclude Include="..\source\LeakFinder.h" />
     <ClInclude Include="..\source\LightingThread.h" />
     <ClInclude Include="..\Source\LuaFunctions.h" />
@@ -605,7 +608,6 @@
     <ClInclude Include="..\source\Bindings.h" />
     <ClInclude Include="..\source\Defines.h" />
     <ClInclude Include="..\source\MCSocket.h" />
-    <ClInclude Include="..\source\NBT.h" />
     <ClInclude Include="..\Source\PacketID.h" />
     <ClInclude Include="..\source\packets\cPacket.h" />
     <ClInclude Include="..\source\packets\cPacket_13.h" />
@@ -656,15 +658,15 @@
     <ClInclude Include="..\source\packets\cPacket_WindowClick.h" />
     <ClInclude Include="..\source\packets\cPacket_WindowClose.h" />
     <ClInclude Include="..\source\packets\cPacket_WindowOpen.h" />
-    <ClInclude Include="..\source\ptr_cChunk.h" />
     <ClInclude Include="..\source\SquirrelBindings.h" />
     <ClInclude Include="..\source\StackWalker.h" />
     <ClInclude Include="..\source\StringCompression.h" />
     <ClInclude Include="..\source\StringUtils.h" />
+    <ClInclude Include="..\source\StructGen.h" />
+    <ClInclude Include="..\source\Trees.h" />
     <ClInclude Include="..\source\Vector3d.h" />
     <ClInclude Include="..\source\Vector3f.h" />
     <ClInclude Include="..\source\Vector3i.h" />
-    <ClInclude Include="..\source\WGFlat.h" />
     <ClInclude Include="..\source\WorldStorage.h" />
     <ClInclude Include="..\source\WSSAnvil.h" />
     <ClInclude Include="..\source\WSSCompact.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index dcbf530a9..4098023bb 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -217,9 +217,6 @@
     <Filter Include="cNoise">
       <UniqueIdentifier>{58d6aa00-beab-4654-bbbd-c3b0397a9549}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cGenSettings">
-      <UniqueIdentifier>{731dfafd-78a6-47d4-8494-a8e024f24c07}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cMakeDir">
       <UniqueIdentifier>{102fff22-0eb3-4977-9de3-307534954fbc}</UniqueIdentifier>
     </Filter>
@@ -379,9 +376,6 @@
     <Filter Include="Packets\cPacket_ItemData">
       <UniqueIdentifier>{fcc08e08-8dba-47b4-89b0-5dc255bb9b8a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cChunkGenerator">
-      <UniqueIdentifier>{0d6f822b-71eb-406f-b17a-d188c4924283}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cEntity\cPawn\cMonster\Personalities">
       <UniqueIdentifier>{b0f7c883-e2ca-4bba-89e3-c36656c3de39}</UniqueIdentifier>
     </Filter>
@@ -394,15 +388,9 @@
     <Filter Include="cEntity\cPawn\cMonster\Personalities\PassiveAggressive">
       <UniqueIdentifier>{71574b1c-a518-4a17-92c1-e3ea340f73bc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cWorldGenerator">
-      <UniqueIdentifier>{72727ea7-779f-439e-8f30-53bd6985c9e7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="!LuaPlugins">
       <UniqueIdentifier>{4b86e1cf-ea3c-40b6-82b2-82fa9e6eb35e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cWorldGenerator\cWorldGenerator_Test">
-      <UniqueIdentifier>{c86f4c53-af06-4b42-97dd-ffb7035041ce}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Simulator">
       <UniqueIdentifier>{ad41fc50-2d3d-4f6f-addd-a8bcb15b8518}</UniqueIdentifier>
     </Filter>
@@ -433,9 +421,6 @@
     <Filter Include="cInventory\cCreativeInventory">
       <UniqueIdentifier>{69e6a927-8e49-4d39-af88-f587d17bb8a3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="!Smart_Pointers">
-      <UniqueIdentifier>{9bd7a65c-b60f-4905-ae2b-7c3c7586eaef}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cPlugin\cPlugin_NewLua">
       <UniqueIdentifier>{fb282bd3-cf18-44b3-8ccc-9a5a89701a6d}</UniqueIdentifier>
     </Filter>
@@ -445,6 +430,9 @@
     <Filter Include="Simulator\cSimulator\cRedstoneSimulator">
       <UniqueIdentifier>{4b3b7b43-8e8b-4823-b112-2259fdfff7d3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Generating">
+      <UniqueIdentifier>{833e49bd-848d-42de-ac60-6cd7656474e3}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Storage">
       <UniqueIdentifier>{038cf4bd-108e-44e2-bdcb-9d48fb26676e}</UniqueIdentifier>
     </Filter>
@@ -664,9 +652,6 @@
     <ClCompile Include="..\source\cNoise.cpp">
       <Filter>cNoise</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\cGenSettings.cpp">
-      <Filter>cGenSettings</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cMakeDir.cpp">
       <Filter>cMakeDir</Filter>
     </ClCompile>
@@ -835,9 +820,6 @@
     <ClCompile Include="..\source\packets\cPacket_ItemData.cpp">
       <Filter>Packets\cPacket_ItemData</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\cChunkGenerator.cpp">
-      <Filter>cChunkGenerator</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cFluidSimulator.cpp">
       <Filter>Simulator\cSimulator\cFluidSimulator</Filter>
     </ClCompile>
@@ -850,12 +832,6 @@
     <ClCompile Include="..\source\cPassiveMonster.cpp">
       <Filter>cEntity\cPawn\cMonster\Personalities\Passive</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\cWorldGenerator.cpp">
-      <Filter>cWorldGenerator</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\cWorldGenerator_Test.cpp">
-      <Filter>cWorldGenerator\cWorldGenerator_Test</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cSimulatorManager.cpp">
       <Filter>Simulator</Filter>
     </ClCompile>
@@ -896,12 +872,30 @@
       <Filter>Simulator\cSimulator\cRedstoneSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\ChunkSender.cpp" />
-    <ClCompile Include="..\source\WGFlat.cpp" />
     <ClCompile Include="..\source\packets\cPacket_Player.cpp">
       <Filter>Packets</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\NBT.cpp">
-      <Filter>Storage</Filter>
+    <ClCompile Include="..\source\cChunkGenerator.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\Trees.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\CompoGen.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\HeiGen.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\StructGen.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\BioGen.cpp">
+      <Filter>Generating</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\BlockID.cpp" />
+    <ClCompile Include="..\source\FinishGen.cpp">
+      <Filter>Generating</Filter>
     </ClCompile>
     <ClCompile Include="..\source\WorldStorage.cpp">
       <Filter>Storage</Filter>
@@ -1163,9 +1157,6 @@
     <ClInclude Include="..\source\cNoise.h">
       <Filter>cNoise</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\cGenSettings.h">
-      <Filter>cGenSettings</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cMakeDir.h">
       <Filter>cMakeDir</Filter>
     </ClInclude>
@@ -1337,9 +1328,6 @@
     <ClInclude Include="..\source\packets\cPacket_ItemData.h">
       <Filter>Packets\cPacket_ItemData</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\cChunkGenerator.h">
-      <Filter>cChunkGenerator</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cFluidSimulator.h">
       <Filter>Simulator\cSimulator\cFluidSimulator</Filter>
     </ClInclude>
@@ -1352,12 +1340,6 @@
     <ClInclude Include="..\source\cPassiveMonster.h">
       <Filter>cEntity\cPawn\cMonster\Personalities\Passive</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\cWorldGenerator.h">
-      <Filter>cWorldGenerator</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\cWorldGenerator_Test.h">
-      <Filter>cWorldGenerator\cWorldGenerator_Test</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cSimulatorManager.h">
       <Filter>Simulator</Filter>
     </ClInclude>
@@ -1379,9 +1361,6 @@
     <ClInclude Include="..\source\cSurvivalInventory.h">
       <Filter>cInventory\cSurvivalInventory</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ptr_cChunk.h">
-      <Filter>!Smart_Pointers</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cPlugin_NewLua.h">
       <Filter>cPlugin\cPlugin_NewLua</Filter>
     </ClInclude>
@@ -1401,13 +1380,30 @@
       <Filter>Simulator\cSimulator\cRedstoneSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\ChunkSender.h" />
-    <ClInclude Include="..\source\WGFlat.h" />
     <ClInclude Include="..\source\ChunkDef.h" />
     <ClInclude Include="..\source\packets\cPacket_Player.h">
       <Filter>Packets</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\NBT.h">
-      <Filter>Storage</Filter>
+    <ClInclude Include="..\source\cChunkGenerator.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\StructGen.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\Trees.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\CompoGen.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\HeiGen.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\BioGen.h">
+      <Filter>Generating</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\FinishGen.h">
+      <Filter>Generating</Filter>
     </ClInclude>
     <ClInclude Include="..\source\WorldStorage.h">
       <Filter>Storage</Filter>
-- 
cgit v1.2.3