Miscellaneous cleanup

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 7bb32efeeb927ab6c083d0bc387d7ccbf885e358..ee9c8c2ff340135e62567061df30dfecb9e3a6eb 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -118,7 +118,7 @@ class SceneExporter:
                if scene.background_set:
                        content = resources[scene.name+".wrapper.scene"]
 
-               ss = Statement("pass", "", "content")
+               ss = Statement("step", "", "content")
                ss.sub.append(Statement("depth_test", Token("LEQUAL")))
                ss.sub.append(seq_res.create_reference_statement("lighting", resources[scene.name+".lightn"]))
                ss.sub.append(seq_res.create_reference_statement("scene", content))

diff --git a/demos/desertpillars/data/exported/Desert.seq b/demos/desertpillars/data/exported/Desert.seq
index 8000033c9fbeba789855caa362b29ebd578c0111..b6f94ab9252c85a46266f258f6f9d4db5c6cb189 100644 (file)
--- a/demos/desertpillars/data/exported/Desert.seq
+++ b/demos/desertpillars/data/exported/Desert.seq
@@ -1,5 +1,5 @@
 hdr true;
-pass "" "content"
+step "" "content"
 {
        depth_test LEQUAL;
        lighting "Desert.lightn";

diff --git a/source/core/clipping.cpp b/source/core/clipping.cpp
index e7ad643bdbbd0dadcb908f78f63cf2f0c237528a..79e1aaf06a149912e0bef36e3ab54583bbcf0993 100644 (file)
--- a/source/core/clipping.cpp
+++ b/source/core/clipping.cpp
@@ -3,7 +3,6 @@
 #include "clipplane.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "matrix.h"
 
 using namespace std;
 

diff --git a/source/core/clipping.h b/source/core/clipping.h
index 109aeac99d2cea9561d09f46095bb09a9ce8ab2a..6496aed0ed866c778fa1d93dbbc2a6edb23eeb8a 100644 (file)
--- a/source/core/clipping.h
+++ b/source/core/clipping.h
@@ -9,7 +9,6 @@ namespace Msp {
 namespace GL {
 
 class ClipPlane;
-class Matrix;
 
 class Clipping
 {

diff --git a/source/core/clipplane.h b/source/core/clipplane.h
index f9dca0de5b6257d641a3bb63a5a86d45fe459e26..9160e526cbb2e2d0bccdb25ac7fcb126d1c42c63 100644 (file)
--- a/source/core/clipplane.h
+++ b/source/core/clipplane.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GL_CLIP_H_
-#define MSP_GL_CLIP_H_
+#ifndef MSP_GL_CLIPPLANE_H_
+#define MSP_GL_CLIPPLANE_H_
 
 #include "vector.h"
 

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 9f6795f16ec176d0cb4204354dcd7b4b7a4ad53e..5c3bb9ceb997e51876b4e6a650aae8c350955181 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -1,5 +1,5 @@
-#ifndef PIPELINESTATE_H_
-#define PIPELINESTATE_H_
+#ifndef MSP_GL_PIPELINESTATE_H_
+#define MSP_GL_PIPELINESTATE_H_
 
 #include <vector>
 #include <msp/core/noncopyable.h>
@@ -20,7 +20,6 @@ class StencilTest;
 class Texture;
 class UniformBlock;
 class VertexSetup;
-class WindingTest;
 
 class PipelineState: public NonCopyable
 {

diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index f18bf61c39443196795c2fdb9d80145e2e8d888c..d680ee3c8a76e01d8e244aadc1307fbccd457aa9 100644 (file)
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GL_SL_SPIRV
-#define MSP_GL_SL_SPIRV
+#ifndef MSP_GL_SL_SPIRV_H_
+#define MSP_GL_SL_SPIRV_H_
 
 #include <map>
 #include <string>

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 52edc24924d73c262243fbd1226a296b5f8f2d0f..575b44a85ff4a56ed7351e0a8500a848ba8577c6 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -385,7 +385,6 @@ Renderer::State::State():
        viewport(0),
        scissor(0),
        texture_count(0),
-       lowest_effect_texunit(Limits::get_global().max_texture_bindings),
        clipping(0),
        shprog(0),
        shdata_count(0),

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 23f7c5cc9a3f132d6154b9e9241aedcf7d186322..7997b35cd7618f0aab6d9109f71f72bcadfd7156 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -24,7 +24,6 @@ class Renderable;
 class Sampler;
 class Texture;
 class VertexSetup;
-class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -92,7 +91,6 @@ private:
                const Rect *viewport;
                const Rect *scissor;
                unsigned texture_count;
-               unsigned lowest_effect_texunit;
                const Clipping *clipping;
                const Program *shprog;
                unsigned shdata_count;

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 89d475e3fe1121d83cc98f0f55b6cb372964ccdc..472b572fa4adcc1f6806cf6e80a66c677a0cb355 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -291,7 +291,7 @@ void Sequence::Step::set_blend(const Blend &b)
 
 void Sequence::Step::set_clipping(const Clipping *c)
 {
-       clipping =c;
+       clipping = c;
 }
 
 } // namespace GL