Some changes related to issue #61

knightcrawler25 · Dec 30, 2021 · 9ba3bd3 · 9ba3bd3
1 parent 39a66c3
commit 9ba3bd3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/src/Main.cpp b/src/Main.cpp
@@ -144,7 +144,7 @@ void SaveFrame(const std::string filename)
     stbi_flip_vertically_on_write(true);
     stbi_write_png(filename.c_str(), w, h, 4, data, w * 4);
     printf("Frame saved: %s\n", filename.c_str());
-    delete data;
+    delete[] data;
 }
 
 void Render()

diff --git a/src/core/Scene.cpp b/src/core/Scene.cpp
@@ -75,6 +75,7 @@ namespace GLSLPT
         else
         {
             printf("Unable to load model %s\n", filename.c_str());
+            delete mesh;
             id = -1;
         }
         return id;
@@ -97,6 +98,7 @@ namespace GLSLPT
         else
         {
             printf("Unable to load texture %s\n", filename.c_str());
+            delete texture;
             id = -1;
         }
 
@@ -282,7 +284,7 @@ namespace GLSLPT
                 unsigned char* resizedTex = new unsigned char[reqWidth * reqHeight * 4];
                 stbir_resize_uint8(&textures[i]->texData[0], texWidth, texHeight, 0, resizedTex, reqWidth, reqHeight, 0, 4);
                 textureMapsArray.insert(textureMapsArray.end(), resizedTex, resizedTex + (reqWidth * reqHeight * 4));
-                delete resizedTex;
+                delete[] resizedTex;
             }
             else
                 textureMapsArray.insert(textureMapsArray.end(), textures[i]->texData.begin(), textures[i]->texData.end());

diff --git a/src/core/TiledRenderer.cpp b/src/core/TiledRenderer.cpp
@@ -330,8 +330,8 @@ namespace GLSLPT
         delete outputShader;
         delete tonemapShader;
 
-        delete denoiserInputFramePtr;
-        delete frameOutputPtr;
+        delete[] denoiserInputFramePtr;
+        delete[] frameOutputPtr;
 
         Renderer::Finish();
     }

diff --git a/src/shaders/common/anyhit.glsl b/src/shaders/common/anyhit.glsl
@@ -25,7 +25,7 @@
 bool AnyHit(Ray r, float maxDist)
 {
 
-#ifdef LIGHTS
+#ifdef OPT_LIGHTS
     // Intersect Emitters
     for (int i = 0; i < numOfLights; i++)
     {

diff --git a/src/shaders/common/pathtrace.glsl b/src/shaders/common/pathtrace.glsl
@@ -77,7 +77,7 @@ void GetMaterials(inout State state, in Ray r)
     {
         vec3 texNormal = texture(textureMapsArrayTex, vec3(state.texCoord, texIDs.z)).rgb;
 
-#ifdef OPENGL_NORMALMAP
+#ifdef OPT_OPENGL_NORMALMAP
         texNormal.y = 1.0 - texNormal.y;
 #endif
         texNormal = normalize(texNormal * 2.0 - 1.0);

diff --git a/src/shaders/common/uniforms.glsl b/src/shaders/common/uniforms.glsl
@@ -23,7 +23,6 @@
  */
 
 uniform bool isCameraMoving;
-uniform bool useEnvMap;
 uniform vec3 randomVector;
 uniform vec2 screenResolution;
 uniform float hdrTexSize;