Merge branch 'microbe-damage-effects'

yowshi · Mar 1, 2019 · 47551eb · 47551eb
2 parents 097604d + e02efe3
commit 47551eb
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/scripts/microbe_stage/microbe.as b/scripts/microbe_stage/microbe.as
@@ -134,6 +134,7 @@ class MicrobeComponent : ScriptComponent{
 
     // TODO: initialize
     float hitpoints = DEFAULT_HEALTH;
+    float previousHitpoints = DEFAULT_HEALTH;
     float maxHitpoints = DEFAULT_HEALTH;
     bool dead = false;
     uint deathTimer = 0;
@@ -389,7 +390,7 @@ class MicrobeSystem : ScriptSystem{
             atpDamage(microbeEntity);
         }
 
-        //	Handle hitpoints
+        //  Handle hitpoints
         if((microbeComponent.hitpoints < microbeComponent.maxHitpoints))
         {
             if(MicrobeOperations::getCompoundAmount(world, microbeEntity,
@@ -512,6 +513,11 @@ class MicrobeSystem : ScriptSystem{
         applyCellMovement(components, logicTime);
 
         compoundAbsorberComponent.setAbsorbtionCapacity(microbeComponent.capacity);
+
+        if(microbeComponent.hitpoints != microbeComponent.previousHitpoints)
+            membraneComponent.setHealthFraction(microbeComponent.hitpoints / microbeComponent.maxHitpoints);
+
+        microbeComponent.previousHitpoints = microbeComponent.hitpoints;
     }
 
     private void updateDeadCell(MicrobeSystemCached@ &in components, uint logicTime)

diff --git a/src/microbe_stage/membrane_system.cpp b/src/microbe_stage/membrane_system.cpp
@@ -10,6 +10,7 @@
 #include <OgreTechnique.h>
 #include <OgreTextureUnitState.h>
 
+#include <algorithm>
 #include <atomic>
 
 using namespace thrive;
@@ -198,10 +199,21 @@ void
             ->getPass(0)
             ->getFragmentProgramParameters()
             ->setNamedConstant("membraneColour", colour);
+        coloredMaterial->compile();
+    }
+}
+
+void
+    MembraneComponent::setHealthFraction(float value)
+{
+    healthFraction = std::clamp(value, 0.0f, 1.0f);
+
+    // If we already have created a material we need to re-apply it
+    if(coloredMaterial) {
         coloredMaterial->getTechnique(0)
             ->getPass(0)
-            ->getTextureUnitState(0)
-            ->setHardwareGammaEnabled(true);
+            ->getFragmentProgramParameters()
+            ->setNamedConstant("healthPercentage", healthFraction);
         coloredMaterial->compile();
     }
 }
@@ -326,6 +338,18 @@ void
             ->getPass(0)
             ->getFragmentProgramParameters()
             ->setNamedConstant("membraneColour", colour);
+
+        coloredMaterial->getTechnique(0)
+            ->getPass(0)
+            ->getFragmentProgramParameters()
+            ->setNamedConstant("healthPercentage", healthFraction);
+        coloredMaterial->compile();
+
+        coloredMaterial->getTechnique(0)
+            ->getPass(0)
+            ->getTextureUnitState(0)
+            ->setHardwareGammaEnabled(true);
+
         coloredMaterial->compile();
     }
 

diff --git a/src/microbe_stage/membrane_system.h b/src/microbe_stage/membrane_system.h
@@ -53,6 +53,10 @@ class MembraneComponent : public Leviathan::Component {
     void
         setColour(const Float4& value);
 
+    //! Should set the health percentage.
+    void
+        setHealthFraction(float value);
+
     //! Returns the last set colour
     Float4
         getColour() const;
@@ -213,6 +217,10 @@ class MembraneComponent : public Leviathan::Component {
     //! The amount of compounds stored in the membrane.
     int compoundAmount = 0;
 
+    // The health percentage of a cell, in the range [0.0, 1.0], used to get
+    // damage effects in the membrane.
+    float healthFraction = 1.0;
+
 private:
 };
 

diff --git a/src/scripting/script_initializer.cpp b/src/scripting/script_initializer.cpp
@@ -575,6 +575,13 @@ bool
         ANGELSCRIPT_REGISTERFAIL;
     }
 
+    if(engine->RegisterObjectMethod("MembraneComponent",
+           "void setHealthFraction(float value)",
+           asMETHOD(MembraneComponent, setHealthFraction),
+           asCALL_THISCALL) < 0) {
+        ANGELSCRIPT_REGISTERFAIL;
+    }
+
 
     if(engine->RegisterEnum("MEMBRANE_TYPE") < 0) {
         ANGELSCRIPT_REGISTERFAIL;