Unify shared GPU settings

These were done every render, but it is all same now. Set it up once.
enginmanap · Dec 8, 2024 · 52c556b · 52c556b
1 parent e43d2d9
commit 52c556b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/API/Graphics/GraphicsProgram.cpp b/src/API/Graphics/GraphicsProgram.cpp
@@ -15,6 +15,8 @@ GraphicsProgram::GraphicsProgram(AssetManager* assetManager, const std::string&
     if(materialRequired) {
         setSamplersAndUBOs();
     }
+    graphicsWrapper->attachModelUBO(getID());
+    graphicsWrapper->attachModelIndicesUBO(getID());
 }
 
 GraphicsProgram::GraphicsProgram(AssetManager* assetManager, const std::string& vertexShader, const std::string& geometryShader, const std::string& fragmentShader, bool isMaterialUsed) :
@@ -27,7 +29,8 @@ GraphicsProgram::GraphicsProgram(AssetManager* assetManager, const std::string&
     if(materialRequired) {
         setSamplersAndUBOs();
     }
-
+    graphicsWrapper->attachModelUBO(getID());
+    graphicsWrapper->attachModelIndicesUBO(getID());
 }
 
 GraphicsProgram::~GraphicsProgram() {
@@ -76,9 +79,6 @@ void GraphicsProgram::setSamplersAndUBOs() {
     if (!setUniform("pre_shadowPoint", graphicsWrapper->getMaxTextureImageUnits() - 2)) {
         std::cerr << "Uniform \"pre_shadowPoint\" could not be set for " << this->getProgramName() << std::endl;
     }
-
-    graphicsWrapper->attachModelUBO(getID());
-    graphicsWrapper->attachModelIndicesUBO(getID());
 }
 
 bool GraphicsProgram::addPresetValue(const std::string& uniformName, const std::string& value) {

diff --git a/src/GameObjects/Model.cpp b/src/GameObjects/Model.cpp
@@ -176,7 +176,6 @@ void Model::activateTexturesOnly(std::shared_ptr<const Material>material) {
 }
 
 void Model::renderWithProgram(std::shared_ptr<GraphicsProgram> program, uint32_t lodLevel) {
-    graphicsWrapper->attachModelUBO(program->getID());
     for (auto iter = meshMetaData.begin(); iter != meshMetaData.end(); ++iter) {
 
         if (animated) {
@@ -187,17 +186,14 @@ void Model::renderWithProgram(std::shared_ptr<GraphicsProgram> program, uint32_t
             program->setUniform("isAnimated", false);
         }
         if(program->IsMaterialRequired()) {
-            graphicsWrapper->attachMaterialUBO(program->getID());
+            this->activateTexturesOnly((*iter)->material);
         }
         graphicsWrapper->render(program->getID(), (*iter)->mesh->getVao(), (*iter)->mesh->getEbo(), (*iter)->mesh->getTriangleCount()[lodLevel] * 3);
     }
 }
 
 void Model::renderWithProgramInstanced(const std::vector<glm::uvec4> &modelIndices, GraphicsProgram &program, uint32_t lodLevel) {
 
-    graphicsWrapper->attachModelUBO(program.getID());
-    graphicsWrapper->attachModelIndicesUBO(program.getID());
-
     for (auto iter = meshMetaData.begin(); iter != meshMetaData.end(); ++iter) {
         if (animated) {
             //set all of the bones to unitTransform for testing