Fixed leaky materials bug with pinned particles

Author: NarcisCalin

GalaxyEngine/include/parameters.h

@@ -71,7 +71,7 @@ struct UpdateVariables{
 	float halfDomainWidth = domainSize.x * 0.5f;
 	float halfDomainHeight = domainSize.y * 0.5f;
 
-	bool fullscreenState = true;
+	bool fullscreenState = false;
 
 	int targetFPS = 144;
 

GalaxyEngine/src/Physics/SPH.cpp

@@ -87,7 +87,7 @@ void SPH::PCISPH(std::vector<ParticlePhysics>& pParticles, std::vector<ParticleR
 #pragma omp parallel for
 		for (size_t i = 0; i < N; ++i) {
 
-			if (!rParticles[i].isSPH || rParticles[i].isPinned || rParticles[i].isBeingDrawn) continue;
+			if (!rParticles[i].isSPH || rParticles[i].isBeingDrawn) continue;
 
 			auto& p = pParticles[i];
 			p.predVel = p.vel + dt * 1.5f * (sphForce[i] / p.sphMass);

GalaxyEngine/src/Physics/physics.cpp

@@ -418,10 +418,6 @@ void Physics::physicsUpdate(std::vector<ParticlePhysics>& pParticles, std::vecto
 	if (myVar.isPeriodicBoundaryEnabled) {
 		for (size_t i = 0; i < pParticles.size(); i++) {
 
-			if (rParticles[i].isPinned) {
-				continue;
-			}
-
 			ParticlePhysics& pParticle = pParticles[i];
 
 			pParticle.prevVel = pParticle.vel;
@@ -459,10 +455,6 @@ void Physics::physicsUpdate(std::vector<ParticlePhysics>& pParticles, std::vecto
 	else {
 		for (size_t i = 0; i < pParticles.size(); ) {
 
-			if (rParticles[i].isPinned) {
-				continue;
-			}
-
 			ParticlePhysics& pParticle = pParticles[i];
 
 			pParticle.prevVel = pParticle.vel;

GalaxyEngine/src/globalLogic.cpp

@@ -48,6 +48,11 @@ void pinParticles() {
 		for (size_t i = 0; i < myParam.pParticles.size(); i++) {
 			if (myParam.rParticles[i].isSelected) {
 				myParam.rParticles[i].isPinned = true;
+				myParam.pParticles[i].vel *= 0.0f;
+				myParam.pParticles[i].prevVel *= 0.0f;
+				myParam.pParticles[i].acc *= 0.0f;
+				myParam.pParticles[i].ke *= 0.0f;
+				myParam.pParticles[i].prevKe *= 0.0f;
 			}
 		}
 		myVar.pinFlag = false;
@@ -61,6 +66,16 @@ void pinParticles() {
 		}
 		myVar.unPinFlag = false;
 	}
+
+	for (size_t i = 0; i < myParam.pParticles.size(); i++) {
+		if (myParam.rParticles[i].isPinned) {
+			myParam.pParticles[i].vel *= 0.0f;
+			myParam.pParticles[i].prevVel *= 0.0f;
+			myParam.pParticles[i].acc *= 0.0f;
+			myParam.pParticles[i].ke *= 0.0f;
+			myParam.pParticles[i].prevKe *= 0.0f;
+		}
+	}
 }
 
 void updateScene() {
@@ -139,7 +154,7 @@ void updateScene() {
 #pragma omp parallel for schedule(dynamic)
 		for (size_t i = 0; i < myParam.pParticles.size(); i++) {
 
-			if (myParam.rParticles[i].isBeingDrawn && myVar.isBrushDrawing && myVar.isSPHEnabled) {
+			if ((myParam.rParticles[i].isBeingDrawn && myVar.isBrushDrawing && myVar.isSPHEnabled) || myParam.rParticles[i].isPinned) {
 				continue;
 			}