Merge pull request #416 from Speciesx/master

Added friction settings to some default meshes and more shadow support
RigsOfRods · Aug 19, 2015 · 1dc538f · 1dc538f
2 parents 979d861 + 70490cc
commit 1dc538f
Show file tree

Hide file tree

Showing 55 changed files with 372 additions and 619 deletions.
diff --git a/bin/resources/materials/eurosigns.material b/bin/resources/materials/eurosigns.material
diff --git a/bin/resources/materials/trafficlights.material b/bin/resources/materials/trafficlights.material
@@ -1,12 +1,13 @@
-material trafficlightsequence2
+import * from "managed_mats.material"
+
+material trafficlightsequence2: RoR/Managed_Mats/Base
 {
-	receive_shadows on
-	technique
+	technique BaseTechnique
 	{
-		pass
+		pass BaseRender
 		{
 			depth_bias 2 [2]
-			texture_unit
+			texture_unit Diffuse_Map
 			{
 				anim_texture signalred.dds signalred.dds signalred.dds signalred.dds signalred.dds signalred.dds signalgreen.dds signalgreen.dds signalgreen.dds signalamber.dds 40
 				tex_address_mode wrap
@@ -16,14 +17,13 @@ material trafficlightsequence2
 		}
 	}
 }
-material trafficlightmain
+material trafficlightmain: RoR/Managed_Mats/Base
 {
-	receive_shadows on
-	technique
+	technique BaseTechnique
 	{
-		pass
+		pass BaseRender
 		{
-			texture_unit
+			texture_unit Diffuse_Map
 			{
 				texture trafficlightsdiffuse.dds
 				tex_address_mode wrap
@@ -33,12 +33,11 @@ material trafficlightmain
 		}
 	}
 }
-material trafficlightsequence1
+material trafficlightsequence1: RoR/Managed_Mats/Base
 {
-	receive_shadows on
-	technique
+	technique BaseTechnique
 	{
-		pass
+		pass BaseRender Diffuse_Map
 		{
 			depth_bias 2 [2]
 			texture_unit

diff --git a/bin/resources/meshes/20mtaxiwayY1.odef b/bin/resources/meshes/20mtaxiwayY1.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwayY1_col.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwayY2.odef b/bin/resources/meshes/20mtaxiwayY2.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwayY2_col.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwayconcrete.odef b/bin/resources/meshes/20mtaxiwayconcrete.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwayconcrete.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwaycross.odef b/bin/resources/meshes/20mtaxiwaycross.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwaycross_col.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwayedge.odef b/bin/resources/meshes/20mtaxiwayedge.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwayedge.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwaystraight.odef b/bin/resources/meshes/20mtaxiwaystraight.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwaystraight.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwaystraightx5.odef b/bin/resources/meshes/20mtaxiwaystraightx5.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwaystraightx5.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwaytee.odef b/bin/resources/meshes/20mtaxiwaytee.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwaytee_col.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/20mtaxiwayturn.odef b/bin/resources/meshes/20mtaxiwayturn.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 20mtaxiwayturn.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/40mblastpadend.odef b/bin/resources/meshes/40mblastpadend.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mblastpadend.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mfixeddistance.odef b/bin/resources/meshes/40mfixeddistance.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mfixeddistance.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading03.odef b/bin/resources/meshes/40mheading03.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading03.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading05.odef b/bin/resources/meshes/40mheading05.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading05.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading11.odef b/bin/resources/meshes/40mheading11.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading11.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading18.odef b/bin/resources/meshes/40mheading18.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading18.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading21.odef b/bin/resources/meshes/40mheading21.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading21.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading23.odef b/bin/resources/meshes/40mheading23.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading23.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading27.odef b/bin/resources/meshes/40mheading27.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading27.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading29.odef b/bin/resources/meshes/40mheading29.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading29.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading36.odef b/bin/resources/meshes/40mheading36.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading36.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mheading90.odef b/bin/resources/meshes/40mheading90.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mheading90.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mtaxiwayconcrete.odef b/bin/resources/meshes/40mtaxiwayconcrete.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mtaxiwayconcrete.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/40mtaxiwayedge.odef b/bin/resources/meshes/40mtaxiwayedge.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mtaxiwayedge.mesh
+stdfriction concrete
 endmesh
 end
diff --git a/bin/resources/meshes/40mthreshold.odef b/bin/resources/meshes/40mthreshold.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mthreshold.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mthresholddisp.odef b/bin/resources/meshes/40mthresholddisp.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mthresholddisp.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/40mtouchdown.odef b/bin/resources/meshes/40mtouchdown.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 40mtouchdown.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mblastpadend.odef b/bin/resources/meshes/60mblastpadend.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mblastpadend.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mfixeddistance.odef b/bin/resources/meshes/60mfixeddistance.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mfixeddistance.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mheading05.odef b/bin/resources/meshes/60mheading05.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mheading05.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mheading23.odef b/bin/resources/meshes/60mheading23.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mheading23.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mheading90.odef b/bin/resources/meshes/60mheading90.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mheading90.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mrunway.odef b/bin/resources/meshes/60mrunway.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mrunway.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mrunwaytaxitee.odef b/bin/resources/meshes/60mrunwaytaxitee.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mrunwaytaxitee.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mthreshold.odef b/bin/resources/meshes/60mthreshold.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mthreshold.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mthresholddisp.odef b/bin/resources/meshes/60mthresholddisp.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mthresholddisp.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/60mtouchdown.odef b/bin/resources/meshes/60mtouchdown.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 60mtouchdown.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mblastpadend.odef b/bin/resources/meshes/80mblastpadend.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mblastpadend.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mfixeddistance.odef b/bin/resources/meshes/80mfixeddistance.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mfixeddistance.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mheading05.odef b/bin/resources/meshes/80mheading05.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mheading05.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mheading18.odef b/bin/resources/meshes/80mheading18.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mheading18.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mheading23.odef b/bin/resources/meshes/80mheading23.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mheading23.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mheading36.odef b/bin/resources/meshes/80mheading36.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mheading36.mesh
+stdfriction asphalt
 endmesh
 end
diff --git a/bin/resources/meshes/80mheading90.odef b/bin/resources/meshes/80mheading90.odef
@@ -2,5 +2,6 @@
 1,1,1
 beginmesh
 mesh 80mheading90.mesh
+stdfriction asphalt
 endmesh
 end