Camera copy operator with ismoving check

get progress value for progressive rendering
tails1234 · Jan 6, 2019 · 771d19b · 771d19b
1 parent 8b9d7de
commit 771d19b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/PathTracer/src/Camera.cpp b/PathTracer/src/Camera.cpp
@@ -15,6 +15,20 @@ namespace GLSLPathTracer
         focalDist = 0.1f;
         aperture = 0.0;
         updateCamera();
+
+    }
+
+    Camera::Camera(const Camera& other)
+    {
+        *this = other;
+    }
+
+    Camera& Camera::operator = (const Camera& other)
+    {
+        ptrdiff_t l = (unsigned char*)&isMoving - (unsigned char*)&position.x;
+        isMoving = memcmp(&position.x, &other.position.x, l) != 0;
+        memcpy(&position.x, &other.position.x, l);
+        return *this;
     }
 
     void Camera::offsetOrientation(float x, float y)

diff --git a/PathTracer/src/Camera.h b/PathTracer/src/Camera.h
@@ -7,6 +7,8 @@ namespace GLSLPathTracer
     {
     public:
         Camera(glm::vec3 pos, glm::vec3 lookAt, float fov);
+        Camera(const Camera& other);
+        Camera& operator = (const Camera& other);
 
         void offsetOrientation(float x, float y);
         void offsetPosition(glm::vec3 val);

diff --git a/PathTracer/src/ProgressiveRenderer.cpp b/PathTracer/src/ProgressiveRenderer.cpp
@@ -182,6 +182,13 @@ namespace GLSLPathTracer
         }
     }
 
+    float ProgressiveRenderer::getProgress() const
+    {
+        if (lowRes || fadeIn)
+            return 0.f;
+        return 1.f;
+    }
+
     void ProgressiveRenderer::present() const
     {
         if (!initialized)

diff --git a/PathTracer/src/ProgressiveRenderer.h b/PathTracer/src/ProgressiveRenderer.h
@@ -26,7 +26,7 @@ namespace GLSLPathTracer
         void render();
         void present() const;
         void update(float secondsElapsed);
-        float getProgress() const { return 1.f; }
+        float getProgress() const;
         RendererType getType() const { return Renderer_Progressive; }
     };
 }
diff --git a/PathTracer/src/Renderer.cpp b/PathTracer/src/Renderer.cpp
@@ -112,7 +112,7 @@ namespace GLSLPathTracer
             glGenTextures(1, &albedoTextures);
             glActiveTexture(GL_TEXTURE0);
             glBindTexture(GL_TEXTURE_2D_ARRAY, albedoTextures);
-            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGB, scene->texData.albedoTextureSize.x, scene->texData.albedoTextureSize.y, scene->texData.albedoTexCount);
+            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, scene->texData.albedoTextureSize.x, scene->texData.albedoTextureSize.y, scene->texData.albedoTexCount);
             glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB8, scene->texData.albedoTextureSize.x, scene->texData.albedoTextureSize.y, scene->texData.albedoTexCount, 0, GL_RGB, GL_UNSIGNED_BYTE, scene->texData.albedoTextures);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -124,7 +124,7 @@ namespace GLSLPathTracer
         {
             glGenTextures(1, &metallicRoughnessTextures);
             glBindTexture(GL_TEXTURE_2D_ARRAY, metallicRoughnessTextures);
-            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGB, scene->texData.metallicRoughnessTextureSize.x, scene->texData.metallicRoughnessTextureSize.y, scene->texData.metallicRoughnessTexCount);
+            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, scene->texData.metallicRoughnessTextureSize.x, scene->texData.metallicRoughnessTextureSize.y, scene->texData.metallicRoughnessTexCount);
             glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB8, scene->texData.metallicRoughnessTextureSize.x, scene->texData.metallicRoughnessTextureSize.y, scene->texData.metallicRoughnessTexCount, 0, GL_RGB, GL_UNSIGNED_BYTE, scene->texData.metallicRoughnessTextures);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -136,7 +136,7 @@ namespace GLSLPathTracer
         {
             glGenTextures(1, &normalTextures);
             glBindTexture(GL_TEXTURE_2D_ARRAY, normalTextures);
-            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGB, scene->texData.normalTextureSize.x, scene->texData.normalTextureSize.y, scene->texData.normalTexCount);
+            glTexStorage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, scene->texData.normalTextureSize.x, scene->texData.normalTextureSize.y, scene->texData.normalTexCount);
             glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB8, scene->texData.normalTextureSize.x, scene->texData.normalTextureSize.y, scene->texData.normalTexCount, 0, GL_RGB, GL_UNSIGNED_BYTE, scene->texData.normalTextures);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
             glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);