Skip to content
Snippets Groups Projects
Commit 6cc24f1e authored by BATON Theau's avatar BATON Theau
Browse files

Add more particle texture

parent a83fc494
No related branches found
No related tags found
No related merge requests found
ParticleGenerator/res/textures/glow1.png

28.1 KiB

ParticleGenerator/res/textures/glow2.png

14.4 KiB

ParticleGenerator/res/textures/smoke2.png

46.4 KiB

ParticleGenerator/res/textures/sphere1.png

39.1 KiB

ParticleGenerator/res/textures/water1.png

68.3 KiB

ParticleGenerator/res/textures/water2.png

74.8 KiB

...@@ -59,12 +59,21 @@ namespace pg::scene ...@@ -59,12 +59,21 @@ namespace pg::scene
if(this->_skybox.material().isValid()) { if(this->_skybox.material().isValid()) {
this->_skybox.load( this->_skybox.load(
{ {
<<<<<<< Updated upstream
"res/textures/skybox/snow/right.png", "res/textures/skybox/snow/right.png",
"res/textures/skybox/snow/left.png", "res/textures/skybox/snow/left.png",
"res/textures/skybox/snow/top.png", "res/textures/skybox/snow/top.png",
"res/textures/skybox/snow/bottom.png", "res/textures/skybox/snow/bottom.png",
"res/textures/skybox/snow/front.png", "res/textures/skybox/snow/front.png",
"res/textures/skybox/snow/back.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, Texture::RGBA,
false false
......
...@@ -18,7 +18,7 @@ namespace pg::scene { ...@@ -18,7 +18,7 @@ namespace pg::scene {
_billboardTexture(), _billboardTexture(),
_billboardProgram(), _billboardProgram(),
_ubo(0), _ubo(0),
_interface(this, 8192) {} _interface(this, 16394) {}
void MeshGenerator::initialize() { void MeshGenerator::initialize() {
if(!this->_mesh.isGenerated()) { if(!this->_mesh.isGenerated()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment