瀏覽代碼

begin fix van de map

Dofensmirtsz 9 年之前
父節點
當前提交
eaa185c90a
共有 12 個文件被更改,包括 8 次插入14 次删除
  1. 1 0
      CrystalPoint.vcxproj
  2. 3 0
      CrystalPoint.vcxproj.filters
  3. 1 1
      HeightMap.cpp
  4. 2 12
      worlds/rock.json
  5. 二進制
      worlds/rockHeightmap.pdn
  6. 二進制
      worlds/rockHeightmap.png
  7. 二進制
      worlds/rockHeightmapTest.png
  8. 0 0
      worlds/rockStone2.pdn
  9. 二進制
      worlds/rockStone2.png
  10. 0 0
      worlds/rockStone3.pdn
  11. 二進制
      worlds/rockStone3.png
  12. 1 1
      worlds/worlds.json

+ 1 - 0
CrystalPoint.vcxproj

@@ -201,6 +201,7 @@
   <ItemGroup>
     <None Include="worlds\fire.json" />
     <None Include="worlds\ice.json" />
+    <None Include="worlds\rock.json" />
     <None Include="worlds\small.json" />
     <None Include="worlds\worlds.json" />
   </ItemGroup>

+ 3 - 0
CrystalPoint.vcxproj.filters

@@ -166,6 +166,9 @@
     <None Include="worlds\small.json">
       <Filter>Source Files\json</Filter>
     </None>
+    <None Include="worlds\rock.json">
+      <Filter>Source Files\json</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Media Include="WAVE\Sound.wav">

+ 1 - 1
HeightMap.cpp

@@ -37,7 +37,7 @@ HeightMap::HeightMap(const std::string &file, World* world)
 			Vec3f ca(0, heightAt(x, y + 1) - heightAt(x, y), 1);
 			Vec3f ba(1, heightAt(x + 1, y) - heightAt(x, y), 0);
 
-			if (valueAt(x, y, GREEN) > 0)
+			if (valueAt(x, y, GREEN) > 5)
 			{
 				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)).first, Vec3f(x, heightAt(x, y), y), Vec3f(0, 0, 0), 1, world->getObjectFromValue(valueAt(x, y, GREEN)).second));
 			}

+ 2 - 12
worlds/rock.json

@@ -1,7 +1,7 @@
 {
   "world": {
     "heightmap": "worlds/rockHeightmap.png",
-    "texture": "worlds/rockStone2.png",
+    "texture": "worlds/rockStone3.png",
 	"skybox": "skyboxes/water/",
     "object-templates": [
       {
@@ -34,11 +34,6 @@
         "file": "models/Rocks/Rock10.obj",
         "collision":  true
       },
-      {
-        "color": 160,
-        "file": "models/Rocks/InvisBall.obj",
-        "collision":  true
-      },
       {
         "color": 170,
         "file": "models/Rocks/DraakHoofd.obj",
@@ -49,11 +44,6 @@
         "file": "models/Rocks/DragonWall1.obj",
         "collision":  true
       },
-      {
-        "color": 190,
-        "file": "models/Rocks/Cave1.obj",
-        "collision":  false
-      },
       {
         "color": 200,
         "file": "models/Rocks/SpikeRock2.obj",
@@ -82,7 +72,7 @@
     ]
   },
   "player": {
-    "startposition": [ 1, 5, 20 ]
+    "startposition": [ 270, 5, 330 ]
   },
   "objects": [ ],
   "portal": {     

二進制
worlds/rockHeightmap.pdn


二進制
worlds/rockHeightmap.png


二進制
worlds/rockHeightmapTest.png


文件差異過大導致無法顯示
+ 0 - 0
worlds/rockStone2.pdn


二進制
worlds/rockStone2.png


文件差異過大導致無法顯示
+ 0 - 0
worlds/rockStone3.pdn


二進制
worlds/rockStone3.png


+ 1 - 1
worlds/worlds.json

@@ -1,7 +1,7 @@
 {
   "worlds": [
+    "worlds/rock.json",
     "worlds/small.json",
-	"worlds/rock.json",
     "worlds/ice.json",
     "worlds/fire.json"
   ]

部分文件因文件數量過多而無法顯示