Commit: c7122b53913d9bfe5316e95bc94e73fdeee0e25c
Author: Brecht Van Lommel
Date: Fri Dec 11 01:42:09 2015 +0100
Branches: master
https://developer.blender.org/rBc7122b53913d9bfe5316e95bc94e73fdeee0e25c
IK Solver: remove unused and outdated test code.
===================================================================
D intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
D intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
D intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
D intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
D intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
D intern/iksolver/test/ik_glut_test/common/GlutMouseManager.h
D intern/iksolver/test/ik_glut_test/intern/ChainDrawer.h
D intern/iksolver/test/ik_glut_test/intern/MyGlutKeyHandler.h
D intern/iksolver/test/ik_glut_test/intern/MyGlutMouseHandler.h
D intern/iksolver/test/ik_glut_test/intern/main.cpp
===================================================================
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
deleted file mode 100644
index b138dd1..0000000
--- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
+++ /dev/null
@@ -1,91 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "GlutDrawer.h"
-
-#include "MT_assert.h"
-
-MEM_SmartPtr<GlutDrawManager> GlutDrawManager::m_s_instance =
MEM_SmartPtr<GlutDrawManager>();
-
- GlutDrawManager *
-GlutDrawManager::
-Instance(
-){
- if (m_s_instance == NULL) {
- m_s_instance = new GlutDrawManager();
- }
-
- return m_s_instance;
-}
-
-
-// this is the function you should pass to glut
-
- void
-GlutDrawManager::
-Draw(
-){
- GlutDrawManager *manager = GlutDrawManager::Instance();
-
- if (manager->m_drawer != NULL) {
- manager->m_drawer->Draw();
- }
-}
-
- void
-GlutDrawManager::
-InstallDrawer(
- GlutDrawer * drawer
-){
-
- MT_assert(m_drawer == NULL);
- m_drawer = drawer;
-}
-
- void
-GlutDrawManager::
-ReleaseDrawer(
-){
- m_drawer = NULL;
-}
-
-
-GlutDrawManager::
-~GlutDrawManager(
-){
-
- delete(m_drawer);
-}
-
-
-
-
-
-
-
-
-
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
b/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
deleted file mode 100644
index 05d2424..0000000
--- a/intern/iksolver/test/ik_glut_test/common/GlutDrawer.h
+++ /dev/null
@@ -1,95 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __GLUTDRAWER_H__
-#define __GLUTDRAWER_H__
-
-#include "MEM_NonCopyable.h"
-#include "MEM_SmartPtr.h"
-
-// So pissed off with Glut callback stuff
-// that is impossible to call objects unless they are global
-
-// inherit from GlutDrawer and installl the drawer in the singleton
-// class GlutDrawManager.
-
-class GlutDrawer {
-public :
-
- virtual
- void
- Draw(
- )= 0;
-
- virtual
- ~GlutDrawer(
- ){};
-};
-
-class GlutDrawManager : public MEM_NonCopyable{
-
-public :
-
- static
- GlutDrawManager *
- Instance(
- );
-
- // this is the function you should pass to glut
-
- static
- void
- Draw(
- );
-
- void
- InstallDrawer(
- GlutDrawer *
- );
-
- void
- ReleaseDrawer(
- );
-
- ~GlutDrawManager(
- );
-
-private :
-
- GlutDrawManager (
- ) :
- m_drawer (0)
- {
- };
-
- GlutDrawer * m_drawer;
-
- static MEM_SmartPtr<GlutDrawManager> m_s_instance;
-};
-
-#endif
-
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
deleted file mode 100644
index 0b7a16b..0000000
--- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
+++ /dev/null
@@ -1,84 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "GlutKeyboardManager.h"
-#include "MT_assert.h"
-
-MEM_SmartPtr<GlutKeyboardManager> GlutKeyboardManager::m_s_instance =
MEM_SmartPtr<GlutKeyboardManager>();
-
- GlutKeyboardManager *
-GlutKeyboardManager::
-Instance(
-){
- if (m_s_instance == NULL) {
- m_s_instance = new GlutKeyboardManager();
- }
-
- return m_s_instance;
-}
-
-
-// this is the function you should pass to glut
-
- void
-GlutKeyboardManager::
-HandleKeyboard(
- unsigned char key,
- int x,
- int y
-){
- GlutKeyboardManager *manager = GlutKeyboardManager::Instance();
-
- if (manager->m_handler != NULL) {
- manager->m_handler->HandleKeyboard(key,x,y);
- }
-}
-
- void
-GlutKeyboardManager::
-InstallHandler(
- GlutKeyboardHandler * handler
-){
-
- MT_assert(m_handler == NULL);
- m_handler = handler;
-}
-
- void
-GlutKeyboardManager::
-ReleaseHandler(
-){
- m_handler = NULL;
-}
-
-
-GlutKeyboardManager::
-~GlutKeyboardManager(
-){
-
- delete(m_handler);
-}
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
b/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
deleted file mode 100644
index ea39b68..0000000
--- a/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.h
+++ /dev/null
@@ -1,101 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __GLUTKEYBOARDMANAGER_H__
-#define __GLUTKEYBOARDMANAGER_H__
-
-#include "MEM_NonCopyable.h"
-#include "MEM_SmartPtr.h"
-
-// So pissed off with Glut callback stuff
-// that is impossible to call objects unless they are global
-
-// inherit from GlutKeyboardHandler and installl the drawer in the singleton
-// class GlutKeyboardManager.
-
-class GlutKeyboardHandler : public MEM_NonCopyable {
-public :
-
- virtual
- void
- HandleKeyboard(
- unsigned char key,
- int x,
- int y
- )= 0;
-
- virtual
- ~GlutKeyboardHandler(
- ){};
-};
-
-class GlutKeyboardManager : public MEM_NonCopyable{
-
-public :
-
- static
- GlutKeyboardManager *
- Instance(
- );
-
- // this is the function you should pass to glut
-
- static
- void
- HandleKeyboard(
- unsigned char key,
- int x,
- int y
- );
-
- void
- InstallHandler(
- GlutKeyboardHandler *
- );
-
- void
- ReleaseHandler(
- );
-
- ~GlutKeyboardManager(
- );
-
-private :
-
- GlutKeyboardManager (
- ) :
- m_handler (0)
- {
- };
-
- GlutKeyboardHandler * m_handler;
-
- static MEM_SmartPtr<GlutKeyboardManager> m_s_instance;
-};
-
-#endif
-
diff --git a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
b/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
deleted file mode 100644
index c426f93..0000000
--- a/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
+++ /dev/null
@@ -1,99 +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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "GlutMouseManager.h"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
