Skip to content

Commit

Permalink
pacenotes terrain bump/jump signs, fluids.xml deep param
Browse files Browse the repository at this point in the history
  • Loading branch information
@cryham
cryham committed Sep 9, 2015
1 parent ae76dc5 commit 4238a17
Show file tree
Hide file tree
Showing 8 changed files with 174 additions and 63 deletions.
58 changes: 29 additions & 29 deletions data/materials2/fluids.xml
View file
@@ -1,113 +1,113 @@
<fluids>
<fluid name="water blue" material="Water_blue" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.548 0.742 0.612 1" fogDens="19" fogDensH="1" />
fogHSVA="0.548 0.742 0.612 1" fogDens="19" fogDensH="1" deep="1" />
<fluid name="water cyan" material="Water_cyan" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.475 0.824 0.624 1" fogDens="21" fogDensH="1" />
fogHSVA="0.475 0.824 0.624 1" fogDens="21" fogDensH="1" deep="1" />
<fluid name="water green" material="Water_green" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.277 0.582 0.357 1" fogDens="17" fogDensH="1" />
fogHSVA="0.277 0.582 0.357 1" fogDens="17" fogDensH="1" deep="1" />
<fluid name="water moss" material="Water_moss" density="300" angDamp="0.8" linDamp="0.3" heightDamp="0"
fogHSVA="0.428 0.440 0.258 1" fogDens="12" fogDensH="1" />
fogHSVA="0.428 0.440 0.258 1" fogDens="12" fogDensH="1" deep="1" />
<fluid name="water blue dark" material="Water_blue_dark" density="200" angDamp="0.7" linDamp="0.3" heightDamp="0"
fogHSVA="0.502 0.304 0.308 1" fogDens="15" fogDensH="1" />
fogHSVA="0.502 0.304 0.308 1" fogDens="15" fogDensH="1" deep="1" />

<fluid name="water blue med" material="Water_blue" density="400" angDamp="1.0" linDamp="0.4" heightDamp="0"
fogHSVA="0.548 0.742 0.612 1" fogDens="18" fogDensH="1" />
fogHSVA="0.548 0.742 0.612 1" fogDens="18" fogDensH="1" deep="1" />
<fluid name="water cyan med" material="Water_cyan" density="400" angDamp="1.0" linDamp="0.4" heightDamp="0"
fogHSVA="0.495 0.824 0.624 1" fogDens="20" fogDensH="1" />
fogHSVA="0.495 0.824 0.624 1" fogDens="20" fogDensH="1" deep="1" />
<fluid name="water green med" material="Water_green" density="400" angDamp="1.0" linDamp="0.4" heightDamp="0"
fogHSVA="0.277 0.582 0.357 1" fogDens="16" fogDensH="1" />
fogHSVA="0.277 0.582 0.357 1" fogDens="16" fogDensH="1" deep="1" />

<fluid name="water white" material="Water_white" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.532 0.323 0.631 1" fogDens="17" fogDensH="1" />
fogHSVA="0.532 0.323 0.631 1" fogDens="17" fogDensH="1" deep="1" />
<fluid name="water sunset" material="Water_sunset" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.582 0.521 0.424 1" fogDens="18" fogDensH="1" />
fogHSVA="0.582 0.521 0.424 1" fogDens="18" fogDensH="1" deep="1" />
<fluid name="water sunset cyan" material="Water_sunset_cyan" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.500 0.632 0.424 1" fogDens="21" fogDensH="1" />
fogHSVA="0.500 0.632 0.424 1" fogDens="21" fogDensH="1" deep="1" />
<fluid name="water shore" material="Water_shore" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.532 0.336 0.383 1" fogDens="19" fogDensH="1" />
fogHSVA="0.532 0.336 0.383 1" fogDens="19" fogDensH="1" deep="1" />
<fluid name="water dark" material="Water_dark" density="200" angDamp="0.7" linDamp="0.2" heightDamp="0"
fogHSVA="0.568 0.500 0.088 1" fogDens="18" fogDensH="1" />
fogHSVA="0.568 0.500 0.088 1" fogDens="18" fogDensH="1" deep="1" />


<fluid name="mud easy soft" material="Mud_orange" density="600" angDamp="1.2" linDamp="0.4" heightDamp="3"
fogHSVA="0.128 0.806 0.348 1" fogDens="7" fogDensH="0.6"
bWhForce="1" whMaxAngVel="70" whSpinDamp="20" whForceLong="70" whForceUp="20"
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.2" bumpAngle="0" whSteerMul="2" idParticles="1" />
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.2" bumpAngle="0" whSteerMul="2" idParticles="1" deep="0" />

<fluid name="mud easy med" material="Mud_brown" density="800" angDamp="1.7" linDamp="0.8" heightDamp="6"
fogHSVA="0.101 0.713 0.272 1" fogDens="5" fogDensH="0.6"
bWhForce="1" whMaxAngVel="60" whSpinDamp="25" whForceLong="80" whForceUp="15"
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.2" bumpAngle="0" whSteerMul="2" idParticles="1" />
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.2" bumpAngle="0" whSteerMul="2" idParticles="1" deep="0" />

<fluid name="mud easy hard" material="Mud_dark" density="1000" angDamp="2.2" linDamp="1.3" heightDamp="10"
fogHSVA="0.085 0.767 0.116 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="50" whSpinDamp="30" whForceLong="80" whForceUp="10"
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.2" bumpAngle="0" whSteerMul="1.3" idParticles="2" />
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.2" bumpAngle="0" whSteerMul="1.3" idParticles="2" deep="0" />


<fluid name="mud soft" material="Mud_orange" density="600" angDamp="1.2" linDamp="0.6" heightDamp="3"
fogHSVA="0.128 0.806 0.348 1" fogDens="7" fogDensH="0.6"
bWhForce="1" whMaxAngVel="20" whSpinDamp="20" whForceLong="160" whForceUp="30"
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.8" bumpAngle="10" whSteerMul="1" idParticles="1" />
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.8" bumpAngle="10" whSteerMul="1" idParticles="1" deep="0" />

<fluid name="mud med" material="Mud_brown" density="800" angDamp="1.7" linDamp="0.8" heightDamp="6"
fogHSVA="0.101 0.713 0.272 1" fogDens="5" fogDensH="0.6"
bWhForce="1" whMaxAngVel="60" whSpinDamp="25" whForceLong="80" whForceUp="15"
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.5" idParticles="1" />
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.5" idParticles="1" deep="0" />

<fluid name="mud hard" material="Mud_dark" density="1000" angDamp="2.2" linDamp="1.3" heightDamp="10"
fogHSVA="0.085 0.767 0.116 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="50" whSpinDamp="30" whForceLong="80" whForceUp="10"
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" />
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" deep="0" />


<fluid name="mud hard solid" material="Mud_dark" density="1000" angDamp="2.2" linDamp="1.3" heightDamp="10"
fogHSVA="0.085 0.767 0.116 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="50" whSpinDamp="30" whForceLong="80" whForceUp="10"
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" solid="1" />
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" solid="1" deep="0" />


<fluid name="mud soft JD" material="Mud_orange_JD" density="600" angDamp="1.2" linDamp="0.6" heightDamp="3"
fogHSVA="0.147 0.767 0.210 1" fogDens="7" fogDensH="0.6"
bWhForce="1" whMaxAngVel="20" whSpinDamp="20" whForceLong="160" whForceUp="30"
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.8" bumpAngle="10" whSteerMul="1" idParticles="1" />
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.8" bumpAngle="10" whSteerMul="1" idParticles="1" deep="0" />

<fluid name="mud med JD" material="Mud_brown_JD" density="800" angDamp="1.7" linDamp="0.8" heightDamp="6"
fogHSVA="0.186 0.767 0.196 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="60" whSpinDamp="25" whForceLong="80" whForceUp="15"
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.5" idParticles="1" />
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.5" idParticles="1" deep="0" />

<fluid name="mud hard JD" material="Mud_dark_JD" density="1000" angDamp="2.2" linDamp="1.3" heightDamp="10"
fogHSVA="0.198 0.767 0.104 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="50" whSpinDamp="30" whForceLong="80" whForceUp="10"
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" />
bumpFqX="21.2" bumpFqY="26.2" bumpAmp="0.8" bumpAngle="30" whSteerMul="1.3" idParticles="2" deep="0" />


<fluid name="grease jelly" material="Grease_jelly" density="800" angDamp="1.2" linDamp="0.4" heightDamp="3"
fogHSVA="0.752 0.564 0.170 1" fogDens="12" fogDensH="0.6"
bWhForce="1" whMaxAngVel="70" whSpinDamp="20" whForceLong="70" whForceUp="50"
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.2" bumpAngle="0" whSteerMul="3" idParticles="-1" />
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.2" bumpAngle="0" whSteerMul="3" idParticles="-1" deep="0" />

<fluid name="blue jelly" material="Blue_jelly" density="700" angDamp="1.4" linDamp="0.5" heightDamp="4"
fogHSVA="0.640 0.634 0.120 1" fogDens="12" fogDensH="0.6"
bWhForce="1" whMaxAngVel="60" whSpinDamp="25" whForceLong="80" whForceUp="20"
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.6" bumpAngle="10" whSteerMul="2" idParticles="-1" />
bumpFqX="10.2" bumpFqY="10.5" bumpAmp="0.6" bumpAngle="10" whSteerMul="2" idParticles="-1" deep="0" />

<fluid name="acid green" material="Acid_green" density="500" angDamp="0.9" linDamp="0.4" heightDamp="1"
fogHSVA="0.222 0.798 0.390 1" fogDens="11" fogDensH="0.6"
fDamage="5" />
fDamage="5" deep="1" />

<fluid name="ice solid" material="Ice" density="500" angDamp="0.2" linDamp="0.4" heightDamp="1"
fogHSVA="0.495 0.154 0.696 1" fogDens="6" fogDensH="0.6"
solid="1" surf="roadSnow" idParticles="-1" />
solid="1" surf="roadSnow" idParticles="-1" deep="0" />

<fluid name="lava" material="LavaOrn" density="1000" angDamp="3" linDamp="1.3" heightDamp="3"
fogHSVA="0.047 0.767 0.116 1" fogDens="4" fogDensH="0.6"
bWhForce="1" whMaxAngVel="30" whSpinDamp="65" whForceLong="80" whForceUp="15"
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.1" idParticles="2" fDamage="5" />
bumpFqX="22.2" bumpFqY="23.2" bumpAmp="0.8" bumpAngle="20" whSteerMul="1.1" idParticles="2" fDamage="5" deep="0" />

<fluid name="lava solid" material="LavaBlk" density="500" angDamp="0.2" linDamp="0.4" heightDamp="1"
fogHSVA="0.023 0.742 0.091 1" fogDens="4" fogDensH="0.6"
solid="1" surf="DesertFast" idParticles="-1" fDamage="2" />
solid="1" surf="DesertFast" idParticles="-1" fDamage="2" deep="0" />

</fluids>
1 change: 1 addition & 0 deletions source/ogre/common/data/FluidsXml.cpp
View file
Expand Up @@ -68,6 +68,7 @@ bool FluidsXml::LoadXml(std::string file, std::map <std::string, int>* surf_map)
a = eFl->Attribute("fDamage"); if (a) fp.fDamage = s2r(a);

a = eFl->Attribute("solid"); if (a) fp.solid = s2i(a) > 0;
a = eFl->Attribute("deep"); if (a) fp.deep = s2i(a) > 0;
a = eFl->Attribute("surf");
if (a)
{ std::string s(a);
Expand Down
3 changes: 2 additions & 1 deletion source/ogre/common/data/FluidsXml.h
View file
Expand Up @@ -23,7 +23,8 @@ class FluidParams
float fDamage; // damage per sec, per wheel (div by 4)

bool solid; // if true will collide, rigid
int surf; // surface id from name for solid
int surf; // surface id from name for solid
bool deep; // for pacenotes, true for water (submergable), all others false

// fluid fog
struct FlFog
Expand Down
3 changes: 2 additions & 1 deletion source/ogre/common/data/SceneXml.cpp
View file
Expand Up @@ -93,7 +93,7 @@ SGrassChannel::SGrassChannel()


FluidBox::FluidBox()
:cobj(0), id(-1), idParticles(0), solid(false)
:cobj(0), id(-1), idParticles(0), solid(false), deep(false)
,pos(Vector3::ZERO), rot(Vector3::ZERO)
,size(Vector3::ZERO), tile(0.01,0.01)
{ }
Expand Down Expand Up @@ -162,6 +162,7 @@ void Scene::UpdateFluidsId()
fluids[i].id = id;
fluids[i].idParticles = id == -1 ? -1 : pFluidsXml->fls[id].idParticles;
fluids[i].solid = id == -1 ? false : pFluidsXml->fls[id].solid;
fluids[i].deep = id == -1 ? false : pFluidsXml->fls[id].deep;
if (id == -1)
LogO("!Warning: Scene fluid name: " + fluids[i].name + " not found in xml!");
}
Expand Down
5 changes: 3 additions & 2 deletions source/ogre/common/data/SceneXml.h
View file
Expand Up @@ -230,14 +230,15 @@ class Presets
class FluidBox /// fluid box shape - water, mud, etc.
{
public:
Ogre::Vector3 pos, rot, size; Ogre::Vector2 tile;
Ogre::Vector3 pos, rot, size;
Ogre::Vector2 tile;

int id; // auto set, index to FluidParams, -1 doesnt exist
std::string name;

class btCollisionObject* cobj;
int idParticles; // auto set index for wheel particles -1 none
bool solid; // auto set
bool solid, deep; // auto set, from FluidParams

FluidBox();
};
Expand Down

0 comments on commit 4238a17

Please sign in to comment.