[Bf-blender-cvs] [319db37] temp_manipulators_core: Remove manipulator library for initial core merge
Julian Eisel
noreply at git.blender.org
Sun Sep 25 01:02:53 CEST 2016
Commit: 319db37ac15d1f29c284b014408ace62f0412568
Author: Julian Eisel
Date: Sun Sep 25 01:00:23 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB319db37ac15d1f29c284b014408ace62f0412568
Remove manipulator library for initial core merge
Will continue work on them in 2.8 based custom_manipulators branch, there I can also work on making manipulator drawing based on OpenGL 3.2 core profile.
===================================================================
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_api.h
D source/blender/windowmanager/manipulators/WM_manipulator_library.h
D source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/geom_arrow_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/geom_cube_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/geom_dial_manipulator.c
D source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_geometry.h
D source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
===================================================================
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index c9cf538..b5c1953 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -73,14 +73,6 @@ set(SRC
manipulators/intern/wm_manipulator.c
manipulators/intern/wm_manipulatorgroup.c
manipulators/intern/wm_manipulatormap.c
- manipulators/intern/manipulator_library/arrow_manipulator.c
- manipulators/intern/manipulator_library/arrow2d_manipulator.c
- manipulators/intern/manipulator_library/cage_manipulator.c
- manipulators/intern/manipulator_library/dial_manipulator.c
- manipulators/intern/manipulator_library/primitive_manipulator.c
- manipulators/intern/manipulator_library/geom_arrow_manipulator.c
- manipulators/intern/manipulator_library/geom_cube_manipulator.c
- manipulators/intern/manipulator_library/geom_dial_manipulator.c
manipulators/intern/manipulator_library/manipulator_library_utils.c
WM_api.h
@@ -96,10 +88,8 @@ set(SRC
wm_window.h
manipulators/WM_manipulator_api.h
manipulators/WM_manipulator_types.h
- manipulators/WM_manipulator_library.h
manipulators/wm_manipulator_wmapi.h
manipulators/intern/wm_manipulator_intern.h
- manipulators/intern/manipulator_library/manipulator_geometry.h
manipulators/intern/manipulator_library/manipulator_library_intern.h
)
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 006f1b7..4d159c6 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -44,7 +44,6 @@
/* Include external manipulator API's */
#include "manipulators/WM_manipulator_api.h"
-#include "manipulators/WM_manipulator_library.h"
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_library.h b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
deleted file mode 100644
index 1e71069..0000000
--- a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/windowmanager/manipulators/WM_manipulator_library.h
- * \ingroup wm
- *
- * \name Generic Manipulator Library
- *
- * Only included in WM_api.h and lower level files.
- */
-
-
-#ifndef __WM_MANIPULATOR_LIBRARY_H__
-#define __WM_MANIPULATOR_LIBRARY_H__
-
-struct wmManipulatorGroup;
-
-
-/* -------------------------------------------------------------------- */
-/* 3D Arrow Manipulator */
-
-enum {
- MANIPULATOR_ARROW_STYLE_NORMAL = 1,
- MANIPULATOR_ARROW_STYLE_NO_AXIS = (1 << 1),
- MANIPULATOR_ARROW_STYLE_CROSS = (1 << 2),
- MANIPULATOR_ARROW_STYLE_INVERTED = (1 << 3), /* inverted offset during interaction - if set it also sets constrained below */
- MANIPULATOR_ARROW_STYLE_CONSTRAINED = (1 << 4), /* clamp arrow interaction to property width */
- MANIPULATOR_ARROW_STYLE_BOX = (1 << 5), /* use a box for the arrowhead */
- MANIPULATOR_ARROW_STYLE_CONE = (1 << 6),
-};
-
-/* slots for properties */
-enum {
- ARROW_SLOT_OFFSET_WORLD_SPACE = 0
-};
-
-struct wmManipulator *MANIPULATOR_arrow_new(struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void MANIPULATOR_arrow_set_direction(struct wmManipulator *manipulator, const float direction[3]);
-void MANIPULATOR_arrow_set_up_vector(struct wmManipulator *manipulator, const float direction[3]);
-void MANIPULATOR_arrow_set_line_len(struct wmManipulator *manipulator, const float len);
-void MANIPULATOR_arrow_set_ui_range(struct wmManipulator *manipulator, const float min, const float max);
-void MANIPULATOR_arrow_set_range_fac(struct wmManipulator *manipulator, const float range_fac);
-void MANIPULATOR_arrow_cone_set_aspect(struct wmManipulator *manipulator, const float aspect[2]);
-
-
-/* -------------------------------------------------------------------- */
-/* 2D Arrow Manipulator */
-
-struct wmManipulator *MANIPULATOR_arrow2d_new(struct wmManipulatorGroup *mgroup, const char *name);
-void MANIPULATOR_arrow2d_set_angle(struct wmManipulator *manipulator, const float rot_fac);
-void MANIPULATOR_arrow2d_set_line_len(struct wmManipulator *manipulator, const float len);
-
-
-/* -------------------------------------------------------------------- */
-/* Cage Manipulator */
-
-enum {
- MANIPULATOR_RECT_TRANSFORM_STYLE_TRANSLATE = 1, /* Manipulator translates */
- MANIPULATOR_RECT_TRANSFORM_STYLE_ROTATE = (1 << 1), /* Manipulator rotates */
- MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE = (1 << 2), /* Manipulator scales */
- MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM = (1 << 3), /* Manipulator scales uniformly */
-};
-
-enum {
- RECT_TRANSFORM_SLOT_OFFSET = 0,
- RECT_TRANSFORM_SLOT_SCALE = 1
-};
-
-struct wmManipulator *MANIPULATOR_rect_transform_new(
- struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void MANIPULATOR_rect_transform_set_dimensions(
- struct wmManipulator *manipulator, const float width, const float height);
-
-
-/* -------------------------------------------------------------------- */
-/* Dial Manipulator */
-
-enum {
- MANIPULATOR_DIAL_STYLE_RING = 0,
- MANIPULATOR_DIAL_STYLE_RING_CLIPPED = 1,
- MANIPULATOR_DIAL_STYLE_RING_FILLED = 2,
-};
-
-struct wmManipulator *MANIPULATOR_dial_new(struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void MANIPULATOR_dial_set_up_vector(struct wmManipulator *manipulator, const float direction[3]);
-
-
-/* -------------------------------------------------------------------- */
-/* Facemap Manipulator */
-
-struct wmManipulator *MANIPULATOR_facemap_new(
- struct wmManipulatorGroup *mgroup, const char *name, const int style,
- struct Object *ob, const int facemap);
-struct bFaceMap *MANIPULATOR_facemap_get_fmap(struct wmManipulator *manipulator);
-
-
-/* -------------------------------------------------------------------- */
-/* Primitive Manipulator */
-
-enum {
- MANIPULATOR_PRIMITIVE_STYLE_PLANE = 0,
-};
-
-struct wmManipulator *MANIPULATOR_primitive_new(struct wmManipulatorGroup *mgroup, const char *name, const int style);
-void MANIPULATOR_primitive_set_direction(struct wmManipulator *manipulator, const float direction[3]);
-void MANIPULATOR_primitive_set_up_vector(struct wmManipulator *manipulator, const float direction[3]);
-
-#endif /* __WM_MANIPULATOR_LIBRARY_H__ */
-
diff --git a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
deleted file mode 100644
index b6ae239..0000000
--- a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2016 Blender Foundation.
- * All rights reserved.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
- * \ingroup wm
- *
- * \name 2D Arrow Manipulator
- *
- * \brief Simple arrow manipulator which is dragged into a certain direction.
- */
-
-#include "BIF_gl.h"
-
-#include "BKE_context.h"
-
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_rect.h"
-
-#include "DNA_manipulator_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "ED_screen.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "RNA_access.h"
-
-#include "WM_types.h"
-
-/* own includes */
-#include "WM_manipulator_types.h"
-#include "wm_manipulator_wmapi.h"
-#include "WM_manipulator_library.h"
-#include "wm_manipulator_intern.h"
-#include "manipulator_library_intern.h"
-
-
-typedef struct ArrowManipulator2D {
- wmManipulator manipulator;
-
- float angle;
- float line_len;
-} ArrowManipulator2D;
-
-
-static void arrow2d_draw_geom(ArrowManipulator2D *arrow, const float origin[2])
-{
- const float size = 0.11f;
- const float size_h = size / 2.0f;
- const float len = arrow->line_len;
- const float draw_line_ofs = (arrow->manipulator.line_width * 0.5f) / arrow->manipulator.scale;
-
- glPushMatrix();
- glTranslate2fv(origin);
- glScalef(arrow->manipulator.scale, arrow->manipulator.scale, 0.0f);
- glRotatef(RAD2DEGF(arrow->angle), 0.0f, 0.0f, 1.0f);
- /* local offset */
- glTranslatef(arrow->manipulator.offset[0] + draw_line_ofs, arrow->manipulator.offset[1], 0.0f);
-
- /* TODO get rid of immediate mode */
- glBegin(GL_LINES);
- glVertex2f(0.0f, 0.0f);
- glVertex2f(0.0f, len);
- glEnd();
- glBegin(GL_TRIANGLES);
- glVertex2f(size_h, len);
- glVertex2f(-size_h,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list