TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1005 from BeamNG/revert_terrain_opengl

Browse source 
Revert terrain opengl
This commit is contained in:
LuisAntonRebollo 2014-12-10 00:08:35 +01:00
commit 5e4a0fbaa1
37 changed files with 81 additions and 833 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Templates/Full/game/art/terrains/Example/dirt_grass_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 558 KiB

BIN
Templates/Full/game/art/terrains/Example/grass1_dry_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 561 KiB

BIN
Templates/Full/game/art/terrains/Example/grass1_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 699 KiB

BIN
Templates/Full/game/art/terrains/Example/grass2_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 598 KiB

BIN
Templates/Full/game/art/terrains/Example/road_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 610 KiB

BIN
Templates/Full/game/art/terrains/Example/rocks1_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 780 KiB

BIN
Templates/Full/game/art/terrains/Example/rocktest_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 788 KiB

BIN
Templates/Full/game/art/terrains/Example/sand_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 172 KiB

BIN
Templates/Full/game/art/terrains/Example/snowtop_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 211 KiB

BIN
Templates/Full/game/art/terrains/Example/stone_n.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 627 KiB

33
Templates/Full/game/art/terrains/materials.cs
View file

@ -47,8 +47,6 @@ new TerrainMaterial()
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
normalMap = "art/terrains/Example/grass1_n";
detailDistance = "1000";
};
singleton Material(TerrainFX_grass2)
@ -99,7 +97,6 @@ new TerrainMaterial()
Enabled = "1";
diffuseSize = "250";
detailStrength = "2";
normalMap = "art/terrains/Example/grass1_dry_n";
};
singleton Material(TerrainFX_dirt_grass)
@ -111,15 +108,6 @@ singleton Material(TerrainFX_dirt_grass)
showFootprints = "1";
materialTag0 = "Terrain";
effectColor[0] = "0.63 0.55 0 1";
diffuseMap = "art/terrains/Example/dirt_grass";
diffuseSize = "200";
normalMap = "art/terrains/Example/dirt_grass_n";
detailMap = "art/terrains/Example/dirt_grass_d";
detailDistance = "100";
internalName = "dirt_grass";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
@ -150,16 +138,6 @@ singleton Material(TerrainFX_rocktest)
impactSoundId = "1";
effectColor[0] = "0.25 0.25 0.25 1";
effectColor[1] = "0.25 0.25 0.25 0";
diffuseMap = "art/terrains/Example/rocktest";
diffuseSize = "400";
normalMap = "art/terrains/Example/rocktest_n";
detailMap = "art/terrains/Example/rocktest_d";
detailSize = "10";
detailDistance = "100";
internalName = "rocktest";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
@ -190,16 +168,6 @@ singleton Material(TerrainFX_stone)
impactSoundId = "1";
effectColor[0] = "0.25 0.25 0.25 1";
effectColor[1] = "0.25 0.25 0.25 0";
diffuseMap = "art/terrains/Example/stone";
diffuseSize = "400";
normalMap = "art/terrains/Example/stone_n";
detailMap = "art/terrains/Example/stone_d";
detailSize = "10";
detailDistance = "100";
internalName = "stone";
isManaged = "1";
detailBrightness = "1";
enabled = "1";
};
new TerrainMaterial()
@ -243,5 +211,4 @@ new TerrainMaterial()
detailBrightness = "1";
Enabled = "1";
diffuseSize = "200";
normalMap = "art/terrains/Example/sand_n";
};