Blender Git Loki
Git Commits -> Revision 8fa55d9
Revision 8fa55d9 by Antonis Ryakiotakis (master) November 26, 2014, 14:07 (GMT) |
World background working on cycle nodes. This is added in the spirit of the general cycles GLSL system which is pretty much WIP still. This will only work on cycles at the moment but generating for blender internal is possible too of course though it will be done in a separate commit. This hasn't been tested with all and every node in cycles, but environment and regular textures with texture coordinates work. There is some difference between the way cycles treats some coordinates, which is in world space and the way GLSL treats them, which is in view space. We might want to explore and improve this further in the future. ...also </drumroll> |
Commit Details:
Full Hash: 8fa55d95e43392a0e7925e1327e86220a33b4394
Parent Commit: 8bc84e1
Lines Changed: +324, -94
1 Added Path:
/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl (+13, -0) (View)
22 Modified Paths:
/SConstruct (+1, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/world.c (+5, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -0) (Diff)
/source/blender/editors/render/render_update.c (+21, -10) (Diff)
/source/blender/editors/space_node/node_edit.c (+18, -5) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+29, -8) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+10, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+21, -7) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+111, -49) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+45, -0) (Diff)
/source/blender/makesdna/DNA_world_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_world.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_background.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_world.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+12, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+9, -3) (Diff)
/source/blender/blenkernel/intern/material.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/world.c (+5, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -0) (Diff)
/source/blender/editors/render/render_update.c (+21, -10) (Diff)
/source/blender/editors/space_node/node_edit.c (+18, -5) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+29, -8) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+10, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+21, -7) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+111, -49) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+45, -0) (Diff)
/source/blender/makesdna/DNA_world_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_world.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_background.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_world.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+12, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+9, -3) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021