Commit: 9f643efc66b73e93e99510bfc35e228ee7bc2762
Author: Campbell Barton
Date: Wed Apr 5 19:31:05 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB9f643efc66b73e93e99510bfc35e228ee7bc2762
Finish of removal of GLU deps
Will commit full removal next
===================================================================
M CMakeLists.txt
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47fb65daafb..4fe6df2c67b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1052,11 +1052,6 @@ endif()
find_package(OpenGL)
blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
-# IMM-FIXME
-if(TRUE)
- list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
-endif()
-
if(WITH_SYSTEM_GLES)
find_package_wrapper(OpenGLES)
endif()
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index f20c3cc2317..3011c4cabac 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -46,8 +46,11 @@
#include "ED_view3d.h"
#include "ED_screen.h"
-#include "GPU_select.h"
+#include "GPU_draw.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
#include "GPU_matrix.h"
+#include "GPU_select.h"
#include "MEM_guardedalloc.h"
@@ -62,7 +65,7 @@
#include "manipulator_geometry.h"
#include "manipulator_library_intern.h"
-// #define USE_IMM
+#define USE_IMM
#ifndef USE_IMM
# include <GL/glu.h>
@@ -109,11 +112,8 @@ static void manipulator_arrow_get_final_pos(wmManipulator
*manipulator, float r_
static void arrow_draw_geom(const ArrowManipulator *arrow, const bool select,
const float color[4])
{
-
-#ifdef USE_IMM
-#else
+ /* USE_IMM for other arrow types */
glColor4fv(color);
-#endif
if (arrow->style & MANIPULATOR_ARROW_STYLE_CROSS) {
glPushAttrib(GL_ENABLE_BIT);
@@ -193,16 +193,22 @@ static void arrow_draw_geom(const ArrowManipulator
*arrow, const bool select, co
/* translate to line end */
#ifdef USE_IMM
+ UNUSED_VARS(use_lighting);
+ unsigned int pos = add_attrib(immVertexFormat(), "pos",
GL_FLOAT, 3, KEEP_FLOAT);
gpuTranslate3f(0.0f, 0.0f, arrow->len);
+
+ immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+ immUniformColor4fv(color);
#else
glTranslatef(0.0f, 0.0f, arrow->len);
-#endif
if (use_lighting) {
glShadeModel(GL_SMOOTH);
}
+#endif
#ifdef USE_IMM
- // IMM-FIXME
+ imm_draw_circle_fill_3d(pos, 0.0, 0.0, width, 8);
+ imm_draw_cylinder_fill_3d(pos, width, 0.0, len, 8, 1);
#else
GLUquadricObj *qobj = gluNewQuadric();
gluQuadricDrawStyle(qobj, GLU_FILL);
@@ -213,9 +219,13 @@ static void arrow_draw_geom(const ArrowManipulator *arrow,
const bool select, co
gluDeleteQuadric(qobj);
#endif
+#ifdef USE_IMM
+ immUnbindProgram();
+#else
if (use_lighting) {
glShadeModel(GL_FLAT);
}
+#endif
}
#ifdef USE_IMM
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
