Blender Git Loki
Git Commits -> Revision 6d62a18
Revision 6d62a18 by Brecht Van Lommel (apricot) June 13, 2008, 21:24 (GMT) |
Apricot Branch: GLSL ==================== * Added support for lamps and shaders. All material diffuse and specular shaders are supported, for lamps especially area light support is not there yet. * Added support for these GLSL shaders in the game engine, though it is incomplete and somewhat of a hack. Specifically all the variables are completely static, which means moving lights, or animating material properties will not work. * Enabling GLSL shaders is now different. They work in textured drawmode, and can be enabled in the Game menu with the option "Blender GLSL Materials" Known issues: * The GLSL shaders don't always update correct on light changes. * The game player appears to crash with these GLSL shaders, while regular blender works fine. |
Commit Details:
Full Hash: 6d62a18a51303da845df1c04cd2b357853b7e7ed
SVN Revision: 15217
Parent Commit: 9fb4cbc
Lines Changed: +1971, -786
2 Added Paths:
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+95, -0) (View)
/source/gameengine/Ketsji/BL_BlenderShader.h (+37, -0) (View)
/source/gameengine/Ketsji/BL_BlenderShader.h (+37, -0) (View)
43 Modified Paths:
/source/blender/blenkernel/BKE_colortools.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_global.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/colortools.c (+21, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -10) (Diff)
/source/blender/gpu/GPU_extensions.h (+9, -1) (Diff)
/source/blender/gpu/GPU_material.h (+17, -8) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+85, -26) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+1, -12) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+17, -8) (Diff)
/source/blender/gpu/intern/gpu_material.c (+281, -123) (Diff)
/source/blender/gpu/intern/material_shaders.glsl (+418, -26) (Diff)
/source/blender/gpu/intern/material_shaders.glsl.c (+646, -383) (Diff)
/source/blender/gpu/intern/material_vertex_shader.glsl.c (+10, -11) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+0, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_curves.c (+9, -28) (Diff)
/source/blender/src/drawobject.c (+51, -59) (Diff)
/source/blender/src/header_info.c (+34, -9) (Diff)
/source/blender/src/previewrender.c (+20, -8) (Diff)
/source/blender/src/space.c (+6, -15) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+8, -1) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+1, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+2, -1) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+13, -1) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.h (+5, -0) (Diff)
/source/gameengine/Converter/SConscript (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/SConscript (+2, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+13, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.h (+1, -0) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+2, -1) (Diff)
/source/gameengine/Ketsji/BL_Material.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+1, -0) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+134, -36) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+11, -2) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_ISceneConverter.h (+3, -0) (Diff)
/source/gameengine/Ketsji/Makefile (+1, -0) (Diff)
/source/gameengine/Ketsji/SConscript (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_CameraData.h (+2, -2) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+2, -3) (Diff)
/source/gameengine/Rasterizer/SConscript (+1, -1) (Diff)
/source/blender/blenkernel/BKE_global.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/colortools.c (+21, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -10) (Diff)
/source/blender/gpu/GPU_extensions.h (+9, -1) (Diff)
/source/blender/gpu/GPU_material.h (+17, -8) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+85, -26) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+1, -12) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+17, -8) (Diff)
/source/blender/gpu/intern/gpu_material.c (+281, -123) (Diff)
/source/blender/gpu/intern/material_shaders.glsl (+418, -26) (Diff)
/source/blender/gpu/intern/material_shaders.glsl.c (+646, -383) (Diff)
/source/blender/gpu/intern/material_vertex_shader.glsl.c (+10, -11) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+0, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_curves.c (+9, -28) (Diff)
/source/blender/src/drawobject.c (+51, -59) (Diff)
/source/blender/src/header_info.c (+34, -9) (Diff)
/source/blender/src/previewrender.c (+20, -8) (Diff)
/source/blender/src/space.c (+6, -15) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+8, -1) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+1, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+2, -1) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+13, -1) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.h (+5, -0) (Diff)
/source/gameengine/Converter/SConscript (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/SConscript (+2, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+13, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.h (+1, -0) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+2, -1) (Diff)
/source/gameengine/Ketsji/BL_Material.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+1, -0) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+134, -36) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+11, -2) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_ISceneConverter.h (+3, -0) (Diff)
/source/gameengine/Ketsji/Makefile (+1, -0) (Diff)
/source/gameengine/Ketsji/SConscript (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_CameraData.h (+2, -2) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+2, -3) (Diff)
/source/gameengine/Rasterizer/SConscript (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021