Blender Git Loki
Git Commits -> Revision f17327a
Revision f17327a by Jason Wilkins (soc-2012-swiss_cheese) June 28, 2012, 01:13 (GMT) |
Color Readability: Start to make drawing color specification more consistent and readable. Changed gpuColorPack to gpuColor3x and gpuColor4x which take a hex color code. Define common color codes as readable macros (e.g., #define CPACK_RED 0xFF0000) Special gpuGrey function for shades of grey Change most places that specify an alpha to use floats instead of bytes Always format color components as 0.0f and alpha as 0.000f There are still several places that specify compile time constants for colors and that use float or bytes instead of a single hex. I'd like to unify all of these to use hex, and then put all the colors into GPU_colors.h (if it makes sense to). Some files might do better with a local color dictionary. |
Commit Details:
Full Hash: f17327a3dec7588edf23098a3b2e6ca3636dd052
SVN Revision: 48353
Parent Commit: 2e5564f
Lines Changed: +573, -440
65 Modified Paths:
/source/blender/blenkernel/intern/subsurf_ccg.c (+1, -1) (Diff)
/source/blender/blenlib/intern/pbvh.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+3, -6) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+1, -1) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+6, -6) (Diff)
/source/blender/editors/armature/reeb.c (+5, -5) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -1) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_draw.c (+72, -72) (Diff)
/source/blender/editors/interface/interface_icons.c (+44, -23) (Diff)
/source/blender/editors/interface/interface_panel.c (+13, -7) (Diff)
/source/blender/editors/interface/interface_widgets.c (+7, -7) (Diff)
/source/blender/editors/mask/mask_draw.c (+7, -7) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+9, -9) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+41, -42) (Diff)
/source/blender/editors/screen/glutil.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+5, -4) (Diff)
/source/blender/editors/space_action/action_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+13, -10) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+2, -2) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+8, -8) (Diff)
/source/blender/editors/space_image/image_draw.c (+10, -10) (Diff)
/source/blender/editors/space_info/textview.c (+4, -4) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -1) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+11, -11) (Diff)
/source/blender/editors/space_node/drawnode.c (+13, -14) (Diff)
/source/blender/editors/space_node/node_draw.c (+8, -7) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+3, -4) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+21, -11) (Diff)
/source/blender/editors/space_text/text_draw.c (+1, -1) (Diff)
/source/blender/editors/space_time/space_time.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+8, -8) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+13, -9) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+51, -50) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+10, -9) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+2, -1) (Diff)
/source/blender/editors/transform/transform.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+16, -16) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -0) (Diff)
/source/blender/gpu/GPU_compatibility.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+2, -4) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+44, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate.h (+7, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate_inline.h (+44, -1) (Diff)
/source/blender/windowmanager/intern/wm_dragdrop.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_gesture.c (+13, -13) (Diff)
/source/blender/windowmanager/intern/wm_subwindow.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+3, -3) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp (+6, -6) (Diff)
/source/blender/blenlib/intern/pbvh.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+3, -6) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+1, -1) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+6, -6) (Diff)
/source/blender/editors/armature/reeb.c (+5, -5) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -1) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_draw.c (+72, -72) (Diff)
/source/blender/editors/interface/interface_icons.c (+44, -23) (Diff)
/source/blender/editors/interface/interface_panel.c (+13, -7) (Diff)
/source/blender/editors/interface/interface_widgets.c (+7, -7) (Diff)
/source/blender/editors/mask/mask_draw.c (+7, -7) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+9, -9) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+41, -42) (Diff)
/source/blender/editors/screen/glutil.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+5, -4) (Diff)
/source/blender/editors/space_action/action_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+13, -10) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+2, -2) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+8, -8) (Diff)
/source/blender/editors/space_image/image_draw.c (+10, -10) (Diff)
/source/blender/editors/space_info/textview.c (+4, -4) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -1) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+11, -11) (Diff)
/source/blender/editors/space_node/drawnode.c (+13, -14) (Diff)
/source/blender/editors/space_node/node_draw.c (+8, -7) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+3, -4) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+21, -11) (Diff)
/source/blender/editors/space_text/text_draw.c (+1, -1) (Diff)
/source/blender/editors/space_time/space_time.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+8, -8) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+13, -9) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+51, -50) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+10, -9) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+2, -1) (Diff)
/source/blender/editors/transform/transform.c (+2, -2) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+16, -16) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -0) (Diff)
/source/blender/gpu/GPU_compatibility.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+2, -4) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+44, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate.h (+7, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate_inline.h (+44, -1) (Diff)
/source/blender/windowmanager/intern/wm_dragdrop.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_gesture.c (+13, -13) (Diff)
/source/blender/windowmanager/intern/wm_subwindow.c (+1, -1) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+3, -3) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp (+6, -6) (Diff)