Merge of first part of changes from the apricot branch, especially
[blender.git] / source / gameengine / Ketsji / BL_BlenderShader.h
index da9765dafa474bb29cb2d094d7a60c1e2a718f08..5c1f59f94ade694e319e8bc791db6ede04299721 100644 (file)
@@ -2,9 +2,7 @@
 #ifndef __BL_GPUSHADER_H__
 #define __BL_GPUSHADER_H__
 
-#ifdef BLENDER_GLSL
 #include "GPU_material.h"
-#endif
 
 #include "MT_Matrix4x4.h"
 #include "MT_Matrix3x3.h"
@@ -29,13 +27,9 @@ class BL_Material;
 class BL_BlenderShader
 {
 private:
-#ifdef BLENDER_GLSL
        KX_Scene                *mScene;
        struct Scene    *mBlenderScene;
        struct Material *mMat;
-       GPUMaterial             *mGPUMat;
-#endif
-       bool                    mBound;
        int                             mLightLayer;
        int                             mBlendMode;
 
@@ -46,11 +40,11 @@ public:
        virtual ~BL_BlenderShader();
 
        bool                            Ok();
-       void                            SetProg(bool enable);
+       void                            SetProg(bool enable, double time=0.0);
 
        int GetAttribNum();
        void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
-       void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+       void Update(const class RAS_MeshSlot & ms, class RAS_IRasterizer* rasty);
        int GetBlendMode();
 
        bool Equals(BL_BlenderShader *blshader);