mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-06 16:36:32 +02:00
Code Issues Projects Releases Wiki Activity

Revert previous change, add NewtonianGravity element property instead

Browse Source
This commit is contained in:
Tamás Bálint Misius
2019-10-17 22:29:24 +02:00
parent 6b85231f23
commit 5f7dd033ec
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/simulation/Simulation.cpp
View File

@@ -3805,34 +3805,38 @@ void Simulation::UpdateParticles(int start, int end)
} }
} }
} }
if (elements[t].Gravity || !(elements[t].Properties & TYPE_SOLID))
pGravX = pGravY = 0;
if (!(elements[t].Properties & TYPE_SOLID))
{ {
//Gravity mode by Moach if (elements[t].Gravity)
switch (gravityMode)
{ {
default: //Gravity mode by Moach
case 0: switch (gravityMode)
pGravX = 0.0f; {
pGravY = elements[t].Gravity; default:
break; case 0:
case 1: pGravX = 0.0f;
pGravX = pGravY = 0.0f; pGravY = elements[t].Gravity;
break; break;
case 2: case 1:
pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR)); pGravX = pGravY = 0.0f;
pGravX = elements[t].Gravity * ((float)(x - XCNTR) / pGravD); break;
pGravY = elements[t].Gravity * ((float)(y - YCNTR) / pGravD); case 2:
break; pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR));
pGravX = elements[t].Gravity * ((float)(x - XCNTR) / pGravD);
pGravY = elements[t].Gravity * ((float)(y - YCNTR) / pGravD);
break;
}
} }
//Get some gravity from the gravity map if (elements[t].NewtonianGravity)
if(t!=PT_STKM && t!=PT_STKM2 && t!=PT_FIGH && !(elements[t].Properties & TYPE_SOLID))
{ {
pGravX += elements[t].Gravity * gravx[(y/CELL)*(XRES/CELL)+(x/CELL)]; //Get some gravity from the gravity map
pGravY += elements[t].Gravity * gravy[(y/CELL)*(XRES/CELL)+(x/CELL)]; pGravX += elements[t].NewtonianGravity * gravx[(y/CELL)*(XRES/CELL)+(x/CELL)];
pGravY += elements[t].NewtonianGravity * gravy[(y/CELL)*(XRES/CELL)+(x/CELL)];
} }
} }
else
pGravX = pGravY = 0;
//velocity updates for the particle //velocity updates for the particle
if (t != PT_SPNG || !(parts[i].flags&FLAG_MOVABLE)) if (t != PT_SPNG || !(parts[i].flags&FLAG_MOVABLE))
{ {

1
src/simulation/elements/ANAR.cpp
View File

@@ -15,6 +15,7 @@ Element_ANAR::Element_ANAR()
Loss = 0.80f; Loss = 0.80f;
Collision = 0.1f; Collision = 0.1f;
Gravity = -0.1f; Gravity = -0.1f;
NewtonianGravity = -1.f;
Diffusion = 0.00f; Diffusion = 0.00f;
HotAir = 0.000f * CFDS; HotAir = 0.000f * CFDS;
Falldown = 1; Falldown = 1;

2
src/simulation/elements/Element.cpp
View File

@@ -15,6 +15,7 @@ Element::Element():
Loss(1.0f), Loss(1.0f),
Collision(0.0f), Collision(0.0f),
Gravity(0.0f), Gravity(0.0f),
NewtonianGravity(1.0f),
Diffusion(0.0f), Diffusion(0.0f),
HotAir(0.0f * CFDS), HotAir(0.0f * CFDS),
Falldown(0), Falldown(0),
@@ -64,6 +65,7 @@ std::vector<StructProperty> const &Element::GetProperties()
{ "Loss", StructProperty::Float, offsetof(Element, Loss ) }, { "Loss", StructProperty::Float, offsetof(Element, Loss ) },
{ "Collision", StructProperty::Float, offsetof(Element, Collision ) }, { "Collision", StructProperty::Float, offsetof(Element, Collision ) },
{ "Gravity", StructProperty::Float, offsetof(Element, Gravity ) }, { "Gravity", StructProperty::Float, offsetof(Element, Gravity ) },
{ "NewtonianGravity", StructProperty::Float, offsetof(Element, NewtonianGravity ) },
{ "Diffusion", StructProperty::Float, offsetof(Element, Diffusion ) }, { "Diffusion", StructProperty::Float, offsetof(Element, Diffusion ) },
{ "HotAir", StructProperty::Float, offsetof(Element, HotAir ) }, { "HotAir", StructProperty::Float, offsetof(Element, HotAir ) },
{ "Falldown", StructProperty::Integer, offsetof(Element, Falldown ) }, { "Falldown", StructProperty::Integer, offsetof(Element, Falldown ) },

1
src/simulation/elements/Element.h
View File

@@ -25,6 +25,7 @@ public:
float Loss; float Loss;
float Collision; float Collision;
float Gravity; float Gravity;
float NewtonianGravity;
float Diffusion; float Diffusion;
float HotAir; float HotAir;
int Falldown; int Falldown;

1
src/simulation/elements/FIGH.cpp
View File

@@ -15,6 +15,7 @@ Element_FIGH::Element_FIGH()
Loss = 1.0f; Loss = 1.0f;
Collision = 0.0f; Collision = 0.0f;
Gravity = 0.0f; Gravity = 0.0f;
NewtonianGravity = 0.0f;
Diffusion = 0.0f; Diffusion = 0.0f;
HotAir = 0.00f * CFDS; HotAir = 0.00f * CFDS;
Falldown = 0; Falldown = 0;

1
src/simulation/elements/STKM.cpp
View File

@@ -15,6 +15,7 @@ Element_STKM::Element_STKM()
Loss = 1.0f; Loss = 1.0f;
Collision = 0.0f; Collision = 0.0f;
Gravity = 0.0f; Gravity = 0.0f;
NewtonianGravity = 0.0f;
Diffusion = 0.0f; Diffusion = 0.0f;
HotAir = 0.00f * CFDS; HotAir = 0.00f * CFDS;
Falldown = 0; Falldown = 0;

1
src/simulation/elements/STKM2.cpp
View File

@@ -15,6 +15,7 @@ Element_STKM2::Element_STKM2()
Loss = 1.0f; Loss = 1.0f;
Collision = 0.0f; Collision = 0.0f;
Gravity = 0.0f; Gravity = 0.0f;
NewtonianGravity = 0.0f;
Diffusion = 0.0f; Diffusion = 0.0f;
HotAir = 0.00f * CFDS; HotAir = 0.00f * CFDS;
Falldown = 0; Falldown = 0;