Merge branch 'particles_instanced' of github.com:cpvrlab/SLProject4 i…

…nto particles_instanced
cpvrlab · Nov 27, 2023 · 5f48dd1 · 5f48dd1
2 parents 28df38b + 373ea04
commit 5f48dd1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/modules/sl/source/SL.h b/modules/sl/source/SL.h
@@ -235,7 +235,7 @@ SL_sizeOfVector(const T& vector)
 //-----------------------------------------------------------------------------
 // Some debugging and error handling macros
 #define SL_LOG(...) Utils::log("SLProject", __VA_ARGS__)
-#define SL_EXIT_MSG(message) Utils::log("SLProject Error", (message))
+#define SL_EXIT_MSG(message) Utils::exitMsg("SLProject", (message), __LINE__, __FILE__)
 #define SL_WARN_MSG(message) Utils::warnMsg("SLProject", (message), __LINE__, __FILE__)
 //-----------------------------------------------------------------------------
 #endif
diff --git a/modules/sl/source/SLAssetManager.cpp b/modules/sl/source/SLAssetManager.cpp
@@ -95,7 +95,7 @@ bool SLAssetManager::removeMesh(SLMesh* mesh)
     }
     return false;
 }
-
+//-----------------------------------------------------------------------------
 //! Removes the specified program from the meshes resource vector.
 bool SLAssetManager::removeProgram(SLGLProgram* program)
 {

diff --git a/modules/sl/source/SLMaterial.cpp b/modules/sl/source/SLMaterial.cpp
@@ -150,7 +150,7 @@ SLMaterial::SLMaterial(SLAssetManager* am,
                        SLGLProgram*    program) : SLObject(name)
 {
     _assetManager = am;
-    _ambient.set(0, 0, 0);                          // not used in Cook-Torrance
+    _ambient.set(0, 0, 0); // not used in Cook-Torrance
     _diffuse = diffuse;
     _specular.set(1, 1, 1);                         // not used in Cook-Torrance
     _emissive.set(0, 0, 0, 0);                      // not used in Cook-Torrance
@@ -372,8 +372,7 @@ SLMaterial::~SLMaterial()
         _errorTexture = nullptr;
     }
 }
-
-
+//------------------------------------------------------------------------------
 void SLMaterial::deleteDataGpu()
 {
     if (_program)
@@ -384,8 +383,6 @@ void SLMaterial::deleteDataGpu()
         _program = nullptr;
     }
 }
-
-
 //-----------------------------------------------------------------------------
 /*!
  If this material has not yet a shader program assigned (SLMaterial::_program)
@@ -403,7 +400,10 @@ void SLMaterial::generateProgramPS(bool renderInstanced)
 
         // Check first the asset manager if the requested program type already exists
         string programNameDraw;
-        SLGLProgramGenerated::buildProgramNamePS(this, programNameDraw, true, renderInstanced);
+        SLGLProgramGenerated::buildProgramNamePS(this,
+                                                 programNameDraw,
+                                                 true,
+                                                 renderInstanced);
         _program = _assetManager->getProgramByName(programNameDraw);
 
         // If the program was not found by name generate a new one
@@ -478,7 +478,8 @@ void SLMaterial::generateProgramPS(bool renderInstanced)
         for (int i = 0; i < TT_numTextureType; i++)
             _textures[i].clear();
         if (!_errorTexture && !_compileErrorTexFilePath.empty())
-            _errorTexture = new SLGLTexture(nullptr, _compileErrorTexFilePath);
+            _errorTexture = new SLGLTexture(nullptr,
+                                            _compileErrorTexFilePath);
         _textures[TT_diffuse].push_back(_errorTexture);
     }
 
@@ -487,7 +488,8 @@ void SLMaterial::generateProgramPS(bool renderInstanced)
         for (int i = 0; i < TT_numTextureType; i++)
             _textures[i].clear();
         if (!_errorTexture && !_compileErrorTexFilePath.empty())
-            _errorTexture = new SLGLTexture(nullptr, _compileErrorTexFilePath);
+            _errorTexture = new SLGLTexture(nullptr,
+                                            _compileErrorTexFilePath);
         _textures[TT_diffuse].push_back(_errorTexture);
     }
 }

diff --git a/modules/sl/source/gl/SLGLShader.cpp b/modules/sl/source/gl/SLGLShader.cpp
@@ -149,6 +149,7 @@ SLbool SLGLShader::createAndCompile(SLVLight* lights)
         SLint     lineNum = 1;
         for (string& line : lines)
             SL_LOG("%4d: %s", lineNum++, line.c_str());
+        SL_LOG("\n");
         return false;
     }
 

diff --git a/modules/utils/source/Utils.cpp b/modules/utils/source/Utils.cpp
@@ -201,10 +201,10 @@ vector<string> getStringLines(const string& multiLineString)
     {
         std::string line;
         std::getline(stream, line);
-        if (!stream.good())
-            break;
         line = Utils::trimString(line, "\r");
         res.push_back(line);
+        if (!stream.good())
+            break;
     }
     return res;
 }
@@ -1391,7 +1391,7 @@ std::string ComputerInfos::get()
     // model = model;
 #    endif
 
-#elif defined(ANDROID)                                         //................................................
+#elif defined(ANDROID) //................................................
 
     os = "Android";