Merge pull request Revolutionary-Games#782 from Revolutionary-Games/7…

…62_and_781 762 and 781 and 775
yowshi · May 11, 2019 · b04eb71 · b04eb71
2 parents f65c3d6 + 24aa954
commit b04eb71
Show file tree

Hide file tree

Showing 27 changed files with 928 additions and 866 deletions.
diff --git a/materials/background.material b/materials/background.material
@@ -87,7 +87,7 @@ material Background_Vent
     }
 }
 
-material Background_Bathypalagic
+material Background_Abyssopelagic
 {
     technique
     {
@@ -130,6 +130,51 @@ material Background_Bathypalagic
         }
     }
 }
+
+material Background_Bathypalagic
+{
+    technique
+    {
+        pass
+        {
+            // scene_blend alpha_blend
+            depth_write off
+            depth_check off
+
+            vertex_program_ref Background_VS
+            {
+            }
+            fragment_program_ref Background_PS
+            {
+            }
+            texture_unit 0
+            {
+                filtering none
+            	tex_coord_set 0
+                texture background/Thrive_bathy0.png 2d gamma
+            }
+            texture_unit 1
+            {
+                filtering none
+            	tex_coord_set 1
+                texture background/Thrive_bathy1.png 2d gamma
+            }
+            texture_unit 2
+            {
+                filtering none
+            	tex_coord_set 2
+                texture background/Thrive_bathy2.png 2d gamma
+            }
+            texture_unit 3
+            {
+                filtering none
+            	tex_coord_set 3
+                texture background/Thrive_bathy3.png 2d gamma
+            }
+        }
+    }
+}
+
 material Background_Tidepool
 {
     technique

diff --git a/materials/oxytoxy.material b/materials/oxytoxy.material
@@ -9,7 +9,7 @@ material oxytoxy
             // lighting off
 
             scene_blend alpha_blend
-			depth_write on
+			depth_write off
             point_sprites on
 
             vertex_program_ref Organelle_VS

diff --git a/materials/oxytoxy_fluid.material b/materials/oxytoxy_fluid.material
@@ -0,0 +1,34 @@
+material oxytoxy_fluid
+{
+    receive_shadows on
+
+    technique
+    {
+        pass oxytoxy_fluid
+        {
+            //lighting on
+            scene_blend alpha_blend
+			depth_write on
+
+            vertex_program_ref Organelle_VS
+            {
+                param_named_auto worldViewProj worldviewproj_matrix
+                param_named_auto time time_0_2pi 20
+                param_named size float 0.05
+                param_named maxRot float 15
+            }
+            fragment_program_ref Organelle_PS
+            {
+                param_named tex int 0
+                param_named_auto organelleColour custom 1
+            }
+
+            texture_unit 
+            {
+                texture oxytoxy_fluid.png gamma
+				alpha_op_ex modulate src_manual src_texture 1.0
+                colour_op_ex modulate src_manual src_texture 1.0 1.0 1.0
+            }
+        }
+    }
+}
diff --git a/materials/oxytoxy_gland.material b/materials/oxytoxy_gland.material
@@ -0,0 +1,36 @@
+material oxytoxy_gland
+{
+    receive_shadows on
+
+    technique
+    {
+        pass oxytoxy_gland
+        {
+            // lighting off
+
+            scene_blend alpha_blend
+			depth_write off
+            point_sprites on
+
+            vertex_program_ref Organelle_VS
+            {
+                param_named_auto worldViewProj worldviewproj_matrix
+                param_named_auto time time_0_2pi 20
+                param_named size float 0.05
+                param_named maxRot float 15
+            }
+            fragment_program_ref Organelle_PS
+            {
+                param_named tex int 0
+                param_named_auto organelleColour custom 1
+            }
+
+            texture_unit 
+            {
+                texture oxytoxy_gland.png gamma
+				alpha_op_ex modulate src_manual src_texture .7
+                colour_op_ex modulate src_manual src_texture 1.0 1.0 1.0
+            }
+        }
+    }
+}
diff --git a/scripts/SimulationParameters/MicrobeStage/BioProcesses.json b/scripts/SimulationParameters/MicrobeStage/BioProcesses.json
@@ -60,6 +60,19 @@
             "oxytoxy": 5.0
         }
     },
+
+    "bacterial_oxytoxySynthesis": {
+        "name": "Bacterial Oxytoxy Synthesis",
+
+        "inputs": {
+            "oxygen": 0.21,
+            "atp": 5.0
+        },
+
+        "outputs": {
+            "oxytoxy": 0.5
+        }
+    },
 
 	"chemoSynthesis": {
         "name": "Chemo Synthesis",