diff --git a/ParticleGenerator/res/textures/glow1.png b/ParticleGenerator/res/textures/glow1.png new file mode 100644 index 0000000000000000000000000000000000000000..43ce368cd02a8aca1cdc81c4579053481ff51825 Binary files /dev/null and b/ParticleGenerator/res/textures/glow1.png differ diff --git a/ParticleGenerator/res/textures/glow2.png b/ParticleGenerator/res/textures/glow2.png new file mode 100644 index 0000000000000000000000000000000000000000..6c8c9fd03af0f6d83528c0b826b926aa3afcc1f3 Binary files /dev/null and b/ParticleGenerator/res/textures/glow2.png differ diff --git a/ParticleGenerator/res/textures/smoke2.png b/ParticleGenerator/res/textures/smoke2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b5e137e76ad288139beef30336d968414283886 Binary files /dev/null and b/ParticleGenerator/res/textures/smoke2.png differ diff --git a/ParticleGenerator/res/textures/sphere1.png b/ParticleGenerator/res/textures/sphere1.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6f9a54beb5d67cb706f4c09b6178079463965c Binary files /dev/null and b/ParticleGenerator/res/textures/sphere1.png differ diff --git a/ParticleGenerator/res/textures/water1.png b/ParticleGenerator/res/textures/water1.png new file mode 100644 index 0000000000000000000000000000000000000000..f32766cb8c548eaf93275e8c3543cd28515a0951 Binary files /dev/null and b/ParticleGenerator/res/textures/water1.png differ diff --git a/ParticleGenerator/res/textures/water2.png b/ParticleGenerator/res/textures/water2.png new file mode 100644 index 0000000000000000000000000000000000000000..1e8c9ac492a3d8e58c314547c37a60f2054b6550 Binary files /dev/null and b/ParticleGenerator/res/textures/water2.png differ diff --git a/ParticleGenerator/src/Scene/Scenes/Mesh.cpp b/ParticleGenerator/src/Scene/Scenes/Mesh.cpp index d60ced35bf1f2cf5731f3f55aca35e0c69b14e82..e6d48935d43a2c98e1e8400559d2f47a51d26183 100644 --- a/ParticleGenerator/src/Scene/Scenes/Mesh.cpp +++ b/ParticleGenerator/src/Scene/Scenes/Mesh.cpp @@ -59,12 +59,21 @@ namespace pg::scene if(this->_skybox.material().isValid()) { this->_skybox.load( { +<<<<<<< Updated upstream "res/textures/skybox/snow/right.png", "res/textures/skybox/snow/left.png", "res/textures/skybox/snow/top.png", "res/textures/skybox/snow/bottom.png", "res/textures/skybox/snow/front.png", "res/textures/skybox/snow/back.png", +======= + "res/textures/skybox/sky/right.png", + "res/textures/skybox/sky/left.png", + "res/textures/skybox/sky/top.png", + "res/textures/skybox/sky/bottom.png", + "res/textures/skybox/sky/front.png", + "res/textures/skybox/sky/back.png", +>>>>>>> Stashed changes }, Texture::RGBA, false diff --git a/ParticleGenerator/src/Scene/Scenes/MeshGenerator.cpp b/ParticleGenerator/src/Scene/Scenes/MeshGenerator.cpp index 0f49055069f1f1352a43b39275bc72e3dc5234bb..434f9ba9347dfd1d722b2df910aaa3c2734cef12 100644 --- a/ParticleGenerator/src/Scene/Scenes/MeshGenerator.cpp +++ b/ParticleGenerator/src/Scene/Scenes/MeshGenerator.cpp @@ -18,7 +18,7 @@ namespace pg::scene { _billboardTexture(), _billboardProgram(), _ubo(0), - _interface(this, 8192) {} + _interface(this, 16394) {} void MeshGenerator::initialize() { if(!this->_mesh.isGenerated()) {