← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_BlenderMaterial.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_BlenderMaterial.h
39
39
        void Initialize(
40
40
                class KX_Scene* scene,
41
41
                BL_Material*    mat,
42
 
                GameSettings*   game
 
42
                GameSettings*   game,
 
43
                int                             lightlayer
43
44
        );
44
45
 
45
46
        virtual ~KX_BlenderMaterial();
95
96
                MT_Scalar ref, MT_Scalar emit, MT_Scalar alpha
96
97
        );
97
98
        
98
 
        virtual void Replace_IScene(SCA_IScene *val)
99
 
        {
100
 
                mScene= static_cast<KX_Scene *>(val);
101
 
                if (mBlenderShader)
102
 
                {
103
 
                        mBlenderShader->SetScene(mScene);
104
 
                }
105
 
        };
 
99
        virtual void Replace_IScene(SCA_IScene *val);
106
100
 
107
101
#ifdef WITH_PYTHON
108
102
        // --------------------------------
109
 
        virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
 
103
        virtual PyObject *py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); }
110
104
 
111
 
        static PyObject* pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
112
 
        static PyObject* pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
113
 
        static PyObject* pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
105
        static PyObject *pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
106
        static PyObject *pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
107
        static PyObject *pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
114
108
        static int       pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
115
109
 
116
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, getShader );
117
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, getMaterialIndex );
118
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, getTexture );
119
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, setTexture );
 
110
        KX_PYMETHOD_DOC(KX_BlenderMaterial, getShader);
 
111
        KX_PYMETHOD_DOC(KX_BlenderMaterial, getMaterialIndex);
 
112
        KX_PYMETHOD_DOC(KX_BlenderMaterial, getTexture);
 
113
        KX_PYMETHOD_DOC(KX_BlenderMaterial, setTexture);
120
114
 
121
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, setBlending );
122
 
#endif // WITH_PYTHON
 
115
        KX_PYMETHOD_DOC(KX_BlenderMaterial, setBlending);
 
116
#endif  /* WITH_PYTHON */
123
117
 
124
118
        // --------------------------------
125
119
        // pre calculate to avoid pops/lag at startup
126
 
        virtual void OnConstruction(int layer);
 
120
        virtual void OnConstruction();
127
121
 
128
122
        static void     EndFrame();
129
123
 
137
131
        unsigned int    mBlendFunc[2];
138
132
        bool                    mModified;
139
133
        bool                    mConstructed;                   // if false, don't clean on exit
140
 
 
141
 
        void SetBlenderGLSLShader(int layer);
 
134
        int                             mLightLayer;
 
135
 
 
136
        void InitTextures();
 
137
 
 
138
        void SetBlenderGLSLShader();
142
139
 
143
140
        void ActivatGLMaterials( RAS_IRasterizer* rasty )const;
144
141
        void ActivateTexGen( RAS_IRasterizer *ras ) const;