mgs/gedeng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in particle positioning

Browse Source
This commit is contained in:
karl 2021-05-09 20:00:04 +02:00
parent a44e38afa3
commit 616be9e5fc
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shader/particle_render.gs
View File

@ -3,7 +3,6 @@
uniform mat4 projection; uniform mat4 projection;
uniform mat4 view; uniform mat4 view;
uniform vec3 camera_pos;
uniform vec3 quad1, quad2; uniform vec3 quad1, quad2;
@ -23,7 +22,7 @@ void main() {
if(type_pass[0] != 0.0) { if(type_pass[0] != 0.0) {
// This is not a generator particle // This is not a generator particle
vec3 old_pos = gl_in[0].gl_Position.xyz - camera_pos; vec3 old_pos = gl_in[0].gl_Position.xyz;
float size = size_pass[0]; float size = size_pass[0];
mat4 view_projection_matrix = projection * view; mat4 view_projection_matrix = projection * view;

3
cpp/ParticleSystem.cpp
View File

@ -108,8 +108,6 @@ void ParticleSystem::set_camera(const Camera &camera) {
quad2 = glm::cross(camera.forward(), quad1); quad2 = glm::cross(camera.forward(), quad1);
quad2 = glm::normalize(quad2); quad2 = glm::normalize(quad2);
camera_pos = camera.get_translation();
} }
void ParticleSystem::render() { void ParticleSystem::render() {
@ -123,7 +121,6 @@ void ParticleSystem::render() {
render_shader.setMat4("view", view_matrix); render_shader.setMat4("view", view_matrix);
render_shader.setVec3("quad1", quad1); render_shader.setVec3("quad1", quad1);
render_shader.setVec3("quad2", quad2); render_shader.setVec3("quad2", quad2);
render_shader.setVec3("camera_pos", camera_pos);
texture->bind_to(0); texture->bind_to(0);

1
include/Gedeng/ParticleSystem.h
View File

@ -57,7 +57,6 @@ class ParticleSystem {
glm::mat4 projection_matrix, view_matrix; glm::mat4 projection_matrix, view_matrix;
glm::vec3 quad1, quad2; glm::vec3 quad1, quad2;
glm::vec3 camera_pos;
float elapsed_time; float elapsed_time;
float next_generation_time; float next_generation_time;

2
test/particle-demo/main.cpp
View File

@ -19,7 +19,7 @@ class ParticleApp : public Gedeng::Application {
bump("Resources/Textures/PavingStones/PavingStones070_2K_Displacement.jpg", Gedeng::Texture::Settings()), bump("Resources/Textures/PavingStones/PavingStones070_2K_Displacement.jpg", Gedeng::Texture::Settings()),
normal("Resources/Textures/PavingStones/PavingStones070_2K_Normal.jpg", Gedeng::Texture::Settings()), normal("Resources/Textures/PavingStones/PavingStones070_2K_Normal.jpg", Gedeng::Texture::Settings()),
quad_mesh(Gedeng::QuadMesh(10.0)) { quad_mesh(Gedeng::QuadMesh(10.0)) {
particles.set_position(glm::vec3(0.0f, 0.0f, -5.0f)); particles.set_position(glm::vec3(0.0f, 0.0f, -10.0f));
particles.set_velocity(glm::vec3(-2, 4, -2), glm::vec3(2, 6, 2)); particles.set_velocity(glm::vec3(-2, 4, -2), glm::vec3(2, 6, 2));
particles.set_gravity(glm::vec3(0, -4, 0)); particles.set_gravity(glm::vec3(0, -4, 0));
particles.set_color(glm::vec3(0.0f, 0.5f, 1.0f)); particles.set_color(glm::vec3(0.0f, 0.5f, 1.0f));