begin fix van de map
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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
@@ -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
@@ -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": {
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 169 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 169 KiB |
+44175
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 19 MiB |
+225368
File diff suppressed because one or more lines are too long
Binary file not shown.
|
After Width: | Height: | Size: 92 MiB |
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"worlds": [
|
||||
"worlds/rock.json",
|
||||
"worlds/small.json",
|
||||
"worlds/rock.json",
|
||||
"worlds/ice.json",
|
||||
"worlds/fire.json"
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user