[tuhopuu-cvs] CVS commit: tuhopuu2/source/gameengine/BlenderRoutines KX_BlenderPolyMaterial.cpp KX_BlenderRenderTools.cpp KX_BlenderRenderTools.h tuhopuu2/source/gameengine/Expressions PyObjectPlus.h tuhopuu2/source/gameengine/GameLogic SCA_IObject.cpp SCA_IObject.h tuhopuu2/source/gameengine/GamePlayer/common GPC_PolygonMaterial.cpp GPC_PolygonMaterial.h ...
Kester Maddock
Christopher.Maddock.1 at uni.massey.ac.nz
Sun Jul 4 15:22:53 CEST 2004
kester (Kester Maddock) 2004/07/04 15:22:53 CEST
Modified files:
tuhopuu2/source/gameengine/BlenderRoutines
KX_BlenderPolyMaterial.cpp
KX_BlenderRenderTools.cpp
KX_BlenderRenderTools.h
tuhopuu2/source/gameengine/Expressions PyObjectPlus.h
tuhopuu2/source/gameengine/GameLogic SCA_IObject.cpp
SCA_IObject.h
tuhopuu2/source/gameengine/GamePlayer/common
GPC_PolygonMaterial.cpp
GPC_PolygonMaterial.h
GPC_RenderTools.cpp
GPC_RenderTools.h
tuhopuu2/source/gameengine/GamePlayer/ghost
GPG_Application.cpp
GPG_ghost.cpp
tuhopuu2/source/gameengine/Ketsji KX_Camera.cpp
KX_GameObject.cpp
KX_Light.cpp
KX_MeshProxy.cpp
KX_PyMath.cpp KX_PyMath.h
KX_PythonInit.cpp
KX_VertexProxy.cpp
SConscript
tuhopuu2/source/gameengine/Rasterizer RAS_IRasterizer.h
RAS_IRenderTools.h
tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer
RAS_OpenGLRasterizer.cpp
Log:
GLSL updates:
Merged the GPC_PolygonMaterial & KX_BlenderPolyMaterial classes into KX_PolygonMaterial.
Added Python methods to KX_PolygonMaterial:
mat = gameobj.getMesh().materials
mat[0].loadShader(type, source, name)
type = mat[0].VERTEX_SHADER or mat[0].FRAGMENT_SHADER
souce = GLSL code or name of text window
name = optional name for console debug messages
mat[0].bindAttribute(name, location)
name = attribute name
location = attribute location
Only tangent space is provided currently (at location 1) - bindAttribute("tangent", 1)
mat[0].setUniform(name, value, transpose)
name = uniform name
value = vec2/3/4, mat3/4, float, int
transpose = optional transpose matrix (bool) default = false
Use: setUniform("texture0", 0) # uniform sampler2D texture0;
setUniform("blah", [1.0, 0.0, 0.0, 1.0]) # uniform vec4 blah;
Rewrote Python<->MT converters
Revision Changes Path
1.11 +4 -2 tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.14 +140 -27 tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.5 +8 -1 tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.4 +2 -3 tuhopuu2/source/gameengine/Expressions/PyObjectPlus.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Expressions/PyObjectPlus.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.3 +3 -15 tuhopuu2/source/gameengine/GameLogic/SCA_IObject.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GameLogic/SCA_IObject.cpp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +4 -3 tuhopuu2/source/gameengine/GameLogic/SCA_IObject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GameLogic/SCA_IObject.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.15 +10 -300 tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.5 +4 -4 tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.14 +417 -5 tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.8 +23 -2 tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.11 +2 -2 tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.9 +3 -2 tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.9 +28 -30 tuhopuu2/source/gameengine/Ketsji/KX_Camera.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_Camera.cpp.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.14 +81 -55 tuhopuu2/source/gameengine/Ketsji/KX_GameObject.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_GameObject.cpp.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.5 +10 -6 tuhopuu2/source/gameengine/Ketsji/KX_Light.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_Light.cpp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.4 +16 -4 tuhopuu2/source/gameengine/Ketsji/KX_MeshProxy.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_MeshProxy.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.2 +9 -323 tuhopuu2/source/gameengine/Ketsji/KX_PyMath.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_PyMath.cpp.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
1.2 +84 -53 tuhopuu2/source/gameengine/Ketsji/KX_PyMath.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_PyMath.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
1.14 +64 -76 tuhopuu2/source/gameengine/Ketsji/KX_PythonInit.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_PythonInit.cpp.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.5 +95 -97 tuhopuu2/source/gameengine/Ketsji/KX_VertexProxy.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/KX_VertexProxy.cpp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.11 +2 -0 tuhopuu2/source/gameengine/Ketsji/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Ketsji/SConscript.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.14 +12 -7 tuhopuu2/source/gameengine/Rasterizer/RAS_IRasterizer.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_IRasterizer.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.7 +25 -1 tuhopuu2/source/gameengine/Rasterizer/RAS_IRenderTools.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_IRenderTools.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.19 +49 -7 tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list