Fuckhack

src/Renderer.cpp

@@ -357,18 +357,7 @@ void Renderer::AddTextureToDraw(Texture* texture, glm::vec3 position, glm::quat
 {
 	glm::mat4 modelMatrix = glm::translate(glm::mat4(), position) * glm::toMat4(orientation) * glm::scale(scale);
 
-	glm::vec3 camToParticle = glm::normalize(m_Camera->Position() - position);
-	glm::vec3 up = glm::vec3(0,1,0);
-	glm::vec3 rightVec = glm::normalize(glm::cross(up, camToParticle));
-	glm::vec3 up2 = glm::normalize(glm::cross(camToParticle, rightVec));
-	
-	glm::mat4 billboardMatrix;
-	billboardMatrix[0] = glm::vec4(rightVec, 0);
-	billboardMatrix[1] = glm::vec4(up2, 0);
-	billboardMatrix[2] = glm::vec4(camToParticle, 0);
-	//billboardMatrix[3] = glm::vec4(position, 0);
-
-	TexturesToRender.push_back(std::make_tuple(texture, modelMatrix, billboardMatrix));
+	TexturesToRender.push_back(std::make_tuple(texture, modelMatrix, position));
 }
 
 void Renderer::AddPointLightToDraw(
@@ -770,10 +759,22 @@ void Renderer::DrawFBOScene(Viewport &viewport)
 	{
 		Texture* texture;
 		glm::mat4 modelMatrix;
-		glm::mat4 billboardMatrix;
-		std::tie(texture, modelMatrix, billboardMatrix) = tuple;
+		glm::vec3 position;
+		std::tie(texture, modelMatrix, position) = tuple;
 		
 		//MVP = cameraMatrix * glm::inverse(glm::toMat4(m_Camera->Orientation()) * modelMatrix );
+
+		glm::vec3 camToParticle = glm::normalize(viewport.Camera->Position() - position);
+		glm::vec3 up = glm::vec3(0,1,0);
+		glm::vec3 rightVec = glm::normalize(glm::cross(up, camToParticle));
+		glm::vec3 up2 = glm::normalize(glm::cross(camToParticle, rightVec));
+
+		glm::mat4 billboardMatrix;
+		billboardMatrix[0] = glm::vec4(rightVec, 0);
+		billboardMatrix[1] = glm::vec4(up2, 0);
+		billboardMatrix[2] = glm::vec4(camToParticle, 0);
+		//billboardMatrix[3] = glm::vec4(position, 0);
+
 		MVP = cameraMatrix * modelMatrix * billboardMatrix;
 
 		depthMVP = depthCameraMatrix * modelMatrix;