X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fstenciltest.cpp;h=4c63497759717e2dd3d1c241421a138c9e3bfd45;hb=3efe3bab1c8290bd49a957ebec0ad97e58a35fcf;hp=2e8bbb4db865d5052885facfd96d25341ba1f906;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git diff --git a/source/core/stenciltest.cpp b/source/core/stenciltest.cpp index 2e8bbb4d..4c634977 100644 --- a/source/core/stenciltest.cpp +++ b/source/core/stenciltest.cpp @@ -1,6 +1,5 @@ #include #include -#include "gl.h" #include "stenciltest.h" using namespace std; @@ -8,16 +7,6 @@ using namespace std; namespace Msp { namespace GL { -StencilTest::StencilTest(): - enabled(false), - compare(ALWAYS), - stencil_fail_op(KEEP), - depth_fail_op(KEEP), - depth_pass_op(KEEP), - reference(0) -{ } - - StencilTest::Loader::Loader(StencilTest &st): ObjectLoader(st) { @@ -49,10 +38,10 @@ void operator>>(const LexicalConverter &conv, StencilOp &op) op = SET_ZERO; else if(str=="REPLACE") op = REPLACE; - else if(str=="INCR") - op = INCR; - else if(str=="DECR") - op = DECR; + else if(str=="INCR_CLAMP") + op = INCR_CLAMP; + else if(str=="DECR_CLAMP") + op = DECR_CLAMP; else if(str=="INVERT") op = INVERT; else if(str=="INCR_WRAP") @@ -70,8 +59,8 @@ void operator<<(LexicalConverter &conv, StencilOp op) case KEEP: conv.result("KEEP"); break; case SET_ZERO: conv.result("SET_ZERO"); break; case REPLACE: conv.result("REPLACE"); break; - case INCR: conv.result("INCR"); break; - case DECR: conv.result("DECR"); break; + case INCR_CLAMP: conv.result("INCR_CLAMP"); break; + case DECR_CLAMP: conv.result("DECR_CLAMP"); break; case INVERT: conv.result("INVERT"); break; case INCR_WRAP: conv.result("INCR_WRAP"); break; case DECR_WRAP: conv.result("DECR_WRAP"); break;