Blender Git Commit Log
Git Commits -> Revision 83adc54
Revision 83adc54 by Clément Foucault (master) February 7, 2017, 10:31 (GMT) |
Clay-Engine (merge clay-engine) Initial work by Cl�ment Foucault with contributions from Dalai Felinto (mainly per-collection engine settings logic, and depsgraph iterator placeholder). This makes Blender require OpenGL 3.3. Which means Intel graphic card and OSX will break. Disable CLAY_ENGINE in CMake in those cases. This is a prototype render engine intended to help the design of real render engines. This is mainly an engine with enphasis in matcap and ambient occlusion. Implemented Features -------------------- * Clay Render Engine, following the new API, to be used as reference for future engines * A more complete Matcap customization with more options * Per-Collection render engine settings * New Ground Truth AO - not enabled Missing Features ---------------- * Finish object edit mode - Fix shaders to use new matrix - Fix artifacts when edge does off screen - Fix depth issue - Selection sillhouette - Mesh wires - Use mesh normals (for higher quality matcap) - Non-Mesh objects drawing - Widget drawing - Performance issues * Finish mesh edit mode - Derived-Mesh-less edit mode API (mesh_rende.c) * General edit mode - Per-collection edit mode settings * General engines - Per-collection engine settings (they are their, but they still need to be flushed by depsgraph, and used by the drawing code) |
Commit Details:
Full Hash: 83adc544382689217e19564fd5f2dd62160956cb
Parent Commit: aeb8e81
Committed By: Dalai Felinto
Lines Changed: +5980, -55
20 Added Paths:
/source/blender/draw/DRW_engine.h (+45, -0) (View)
/source/blender/draw/engines/clay/clay.c (+722, -0) (View)
/source/blender/draw/engines/clay/clay.h (+36, -0) (View)
/source/blender/draw/engines/clay/shaders/clay_frag.glsl (+207, -0) (View)
/source/blender/draw/engines/clay/shaders/clay_vert.glsl (+20, -0) (View)
/source/blender/draw/engines/clay/shaders/ssao_alchemy.glsl (+73, -0) (View)
/source/blender/draw/engines/clay/shaders/ssao_groundtruth.glsl (+120, -0) (View)
/source/blender/draw/intern/draw_cache.c (+543, -0) (View)
/source/blender/draw/intern/draw_cache.h (+56, -0) (View)
/source/blender/draw/intern/draw_manager.c (+1148, -0) (View)
/source/blender/draw/intern/draw_mode_pass.c (+787, -0) (View)
/source/blender/draw/intern/draw_mode_pass.h (+45, -0) (View)
/source/blender/draw/intern/DRW_render.h (+221, -0) (View)
/source/blender/gpu/GPU_uniformbuffer.h (+44, -0) (View)
/source/blender/gpu/intern/gpu_uniformbuffer.c (+105, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundline_geom.glsl (+16, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundline_vert.glsl (+8, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundpoint_vert.glsl (+11, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_instance_vert.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_lamp_vert.glsl (+24, -0) (View)
/source/blender/draw/engines/clay/clay.c (+722, -0) (View)
/source/blender/draw/engines/clay/clay.h (+36, -0) (View)
/source/blender/draw/engines/clay/shaders/clay_frag.glsl (+207, -0) (View)
/source/blender/draw/engines/clay/shaders/clay_vert.glsl (+20, -0) (View)
/source/blender/draw/engines/clay/shaders/ssao_alchemy.glsl (+73, -0) (View)
/source/blender/draw/engines/clay/shaders/ssao_groundtruth.glsl (+120, -0) (View)
/source/blender/draw/intern/draw_cache.c (+543, -0) (View)
/source/blender/draw/intern/draw_cache.h (+56, -0) (View)
/source/blender/draw/intern/draw_manager.c (+1148, -0) (View)
/source/blender/draw/intern/draw_mode_pass.c (+787, -0) (View)
/source/blender/draw/intern/draw_mode_pass.h (+45, -0) (View)
/source/blender/draw/intern/DRW_render.h (+221, -0) (View)
/source/blender/gpu/GPU_uniformbuffer.h (+44, -0) (View)
/source/blender/gpu/intern/gpu_uniformbuffer.c (+105, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundline_geom.glsl (+16, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundline_vert.glsl (+8, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_groundpoint_vert.glsl (+11, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_instance_vert.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_3D_lamp_vert.glsl (+24, -0) (View)
2 Deleted Paths:
/source/blender/draw/DRW_defines.h (+0, -25)
/source/blender/draw/DRW_engines.h (+0, -0)
/source/blender/draw/DRW_engines.h (+0, -0)
43 Modified Paths:
/build_files/cmake/macros.cmake (+1, -0) (Diff)
/CMakeLists.txt (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_collection.py (+49, -0) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+19, -0) (Diff)
/release/scripts/startup/bl_ui/properties_render_layer.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_layer.h (+30, -2) (Diff)
/source/blender/blenkernel/intern/layer.c (+240, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+11, -0) (Diff)
/source/blender/blenkernel/intern/mesh_render.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+8, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+23, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+1, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+58, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/draw/CMakeLists.txt (+28, -12) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+40, -2) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -0) (Diff)
/source/blender/gpu/CMakeLists.txt (+9, -0) (Diff)
/source/blender/gpu/gawain/batch.c (+86, -0) (Diff)
/source/blender/gpu/gawain/batch.h (+2, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+2, -0) (Diff)
/source/blender/gpu/GPU_framebuffer.h (+1, -0) (Diff)
/source/blender/gpu/GPU_shader.h (+9, -0) (Diff)
/source/blender/gpu/GPU_viewport.h (+41, -1) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+15, -0) (Diff)
/source/blender/gpu/intern/gpu_framebuffer.c (+37, -1) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+40, -0) (Diff)
/source/blender/gpu/intern/gpu_texture.c (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_viewport.c (+193, -3) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+47, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+40, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+49, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_material.c (+143, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+28, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+435, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+5, -0) (Diff)
/source/blender/render/CMakeLists.txt (+1, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+6, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+20, -4) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+5, -0) (Diff)
/CMakeLists.txt (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_collection.py (+49, -0) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+19, -0) (Diff)
/release/scripts/startup/bl_ui/properties_render_layer.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_layer.h (+30, -2) (Diff)
/source/blender/blenkernel/intern/layer.c (+240, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+11, -0) (Diff)
/source/blender/blenkernel/intern/mesh_render.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+8, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+23, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+1, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+58, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/draw/CMakeLists.txt (+28, -12) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+40, -2) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -0) (Diff)
/source/blender/gpu/CMakeLists.txt (+9, -0) (Diff)
/source/blender/gpu/gawain/batch.c (+86, -0) (Diff)
/source/blender/gpu/gawain/batch.h (+2, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+2, -0) (Diff)
/source/blender/gpu/GPU_framebuffer.h (+1, -0) (Diff)
/source/blender/gpu/GPU_shader.h (+9, -0) (Diff)
/source/blender/gpu/GPU_viewport.h (+41, -1) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+15, -0) (Diff)
/source/blender/gpu/intern/gpu_framebuffer.c (+37, -1) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+40, -0) (Diff)
/source/blender/gpu/intern/gpu_texture.c (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_viewport.c (+193, -3) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+47, -0) (Diff)
/source/blender/makesdna/DNA_material_types.h (+40, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+49, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_material.c (+143, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+28, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+435, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+5, -0) (Diff)
/source/blender/render/CMakeLists.txt (+1, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+6, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+20, -4) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+5, -0) (Diff)