Remove unused file, add set_active to RenderStage

tobspr · Jan 16, 2016 · 290eca2 · 290eca2
1 parent b24c291
commit 290eca2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 111 deletions.
diff --git a/Code/RenderStage.py b/Code/RenderStage.py
@@ -155,6 +155,11 @@ def update(self):
         stages to perform custom updates """
         pass
 
+    def set_active(self, active):
+        """ Enables or disables all targets bound to this stage """
+        for target in self._targets.values():
+            target.set_active(active)
+
     def _make_cubemap_filter(self, *args):
         """ Creates a new CubemapFilter with the given args and returns it """
         return CubemapFilter(self, *args)

diff --git a/Code/Util/CubemapFilter.py b/Code/Util/CubemapFilter.py
@@ -152,7 +152,6 @@ def _make_diffuse_target(self):
         self._diffuse_target = self._stage._create_target(self._name + "DiffuseIBL")
         self._diffuse_target.set_size(CubemapFilter.PREFILTER_CUBEMAP_SIZE * 6,
             CubemapFilter.PREFILTER_CUBEMAP_SIZE)
-        self._diffuse_target.add_color_texture()
         self._diffuse_target.prepare_offscreen_buffer()
 
         self._diffuse_target.set_shader_input("SourceCubemap", self._specular_map.texture)
@@ -164,7 +163,6 @@ def _make_diffuse_target(self):
         self._diff_filter_target = self._stage._create_target(self._name + "DiffPrefIBL")
         self._diff_filter_target.set_size(CubemapFilter.DIFFUSE_CUBEMAP_SIZE * 6,
             CubemapFilter.DIFFUSE_CUBEMAP_SIZE)
-        self._diff_filter_target.add_color_texture()
         self._diff_filter_target.prepare_offscreen_buffer()
 
         self._diff_filter_target.set_shader_input("SourceCubemap", self._prefilter_map.texture)

diff --git a/Plugins/Scattering/ScatteringStage.py b/Plugins/Scattering/ScatteringStage.py
@@ -72,11 +72,8 @@ def set_shaders(self):
             self._load_plugin_shader("ApplyScattering.frag.glsl"))
         self._target_cube.set_shader(
             self._load_plugin_shader("ScatteringEnvmap.frag.glsl"))
-
         self._filter.set_shaders()
-        # mip_shader = self._load_plugin_shader("DownsampleEnvmap.frag.glsl")
-        # for target in self._mip_targets:
-        #     target.set_shader(mip_shader)
+
 
     def resize(self):
         RenderStage.resize(self)

diff --git a/Shader/Includes/ImportanceSampling/ImportanceSampleLambert.inc.glsl b/Shader/Includes/ImportanceSampling/ImportanceSampleLambert.inc.glsl
diff --git a/Shader/Stages/IBLCubemapDiffuse.frag.glsl b/Shader/Stages/IBLCubemapDiffuse.frag.glsl
@@ -36,8 +36,6 @@ uniform samplerCube SourceCubemap;
 uniform writeonly imageCube RESTRICT DestCubemap;
 uniform int cubeSize;
 
-out vec4 result;
-
 void main() {
     const int sample_count = 64;
 
@@ -78,5 +76,4 @@ void main() {
     accum /= weights;
 
     imageStore(DestCubemap, ivec3(clamped_coord, face), vec4(accum, 1) );
-    result = vec4(accum, 1);
 }