Remove cylinder mesh

Flock/flock/src/FlockApp.cc

@@ -60,7 +60,7 @@ void FlockApp::startupGameCore()
 {
     mCameraController = std::make_unique<FollowCameraController>(getCamera());
     mInstancingManager = std::make_shared<InstancingManager>();
-    mPrimitiveParticleRenderer = std::make_unique<PrimitiveParticleRenderer>(&mRegistry, mMeshCylinder);
+    mPrimitiveParticleRenderer = std::make_unique<PrimitiveParticleRenderer>(&mRegistry);
 
     mParticleSystem = std::make_unique<ParticleSystem>();
     mParticleSystem->init();
@@ -336,7 +336,6 @@ void FlockApp::init()
         mMeshTerrorSquid = assimp::Importer().load(resourcePath + "icosphere.obj");
         mMeshBlood = assimp::Importer().load(resourcePath + "icosphere.obj");
         mMeshPlane = assimp::Importer().load(resourcePath + "fighter.obj");
-        mMeshCylinder = assimp::Importer().load(resourcePath + "scaled_cyl.obj");
         auto const skyboxPath = resourcePath + "ibl/studio/skybox/skybox_";
         mSkyboxMap = TextureCubeMap::createFromData(TextureData::createFromFileCube(
             skyboxPath + "posx.hdr", skyboxPath + "negx.hdr", skyboxPath + "posy.hdr", skyboxPath + "negy.hdr",

Flock/flock/src/FlockApp.hh

@@ -48,7 +48,6 @@ private:
     glow::SharedVertexArray mMeshIcosphere;
     glow::SharedVertexArray mMeshBlood;
     glow::SharedVertexArray mMeshTerrorSquid;
-    glow::SharedVertexArray mMeshCylinder;
 
     // == IBL maps ==
     glow::SharedTextureCubeMap mSkyboxMap;

Flock/flock/src/particles/PrimitiveParticleRenderer.cc

@@ -11,8 +11,7 @@
 #include <glow-extras/geometry/Quad.hh>
 #include <glow-extras/geometry/UVSphere.hh>
 
-flock::PrimitiveParticleRenderer::PrimitiveParticleRenderer(entt::registry<uint32_t>* reg, glow::SharedVertexArray const& cylinderMesh)
-  : mRegistry(reg), mCylinder(cylinderMesh)
+flock::PrimitiveParticleRenderer::PrimitiveParticleRenderer(entt::registry<uint32_t>* reg) : mRegistry(reg)
 {
     mQuad = glow::geometry::Quad<PrimitiveVertex>().generate();
     mCube = glow::geometry::Cube<PrimitiveVertex>().generate();

Flock/flock/src/particles/PrimitiveParticleRenderer.hh

@@ -63,13 +63,12 @@ private:
     glow::SharedVertexArray mCube;
     glow::SharedVertexArray mLine;
     glow::SharedVertexArray mSphere;
-    glow::SharedVertexArray mCylinder;
     glow::SharedProgram mShaderTransparent;
 
     float mDeltaTime = 0.f;
 
 public:
-    PrimitiveParticleRenderer(entt::registry<uint32_t>* reg, glow::SharedVertexArray const& cylinderMesh);
+    PrimitiveParticleRenderer(entt::registry<uint32_t>* reg);
 
     /// Renders all stored primitives
     void render(glow::pipeline::RenderPipeline const& pipeline,