Jelajahi Sumber

Added new windows development branch

unknown 7 tahun lalu
induk
melakukan
a916bb89ae
2 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 1 2
      CMakeLists.txt
  2. 4 2
      include/shader.h

+ 1 - 2
CMakeLists.txt

@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.7)
 cmake_minimum_required(VERSION 3.7)
 project(softwareRenderer)
 project(softwareRenderer)
 
 
-
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
-#set(SDL2_PATH "C:\\vs_dev_lib\\SDL2-2.0.8")
+set(SDL2_PATH "C:\\vs_dev_lib\\SDL2-2.0.8")
 find_package(SDL2 REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(OpenMP REQUIRED)
 find_package(OpenMP REQUIRED)
 include_directories(${SDL2_INCLUDE_DIR} include libs)
 include_directories(${SDL2_INCLUDE_DIR} include libs)

+ 4 - 2
include/shader.h

@@ -378,8 +378,8 @@ struct PBRShader : public IShader {
         const int maxLights = numLights;
         const int maxLights = numLights;
 
 
         //Fresnel, normal distribution function and geometry occlusion 
         //Fresnel, normal distribution function and geometry occlusion 
-        Vector3f F[maxLights];
-        float  NDF[maxLights];
+        Vector3f* F = new Vector3f[maxLights];
+        float*  NDF = new float[maxLights];
         float  G[maxLights];
         float  G[maxLights];
         
         
         //Storing in array for vectorizing
         //Storing in array for vectorizing
@@ -435,6 +435,8 @@ struct PBRShader : public IShader {
         //Simplistic ambient term
         //Simplistic ambient term
         ambient =  interpCol * (ambientInt * interpAO);
         ambient =  interpCol * (ambientInt * interpAO);
 
 
+        delete [] F;
+
         return ambient + radianceOut;
         return ambient + radianceOut;
     }
     }