[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33157] trunk/blender/source/kernel: remove unused classes.
Campbell Barton
ideasman42 at gmail.com
Thu Nov 18 13:54:05 CET 2010
Revision: 33157
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33157
Author: campbellbarton
Date: 2010-11-18 13:54:05 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
remove unused classes.
Modified Paths:
--------------
trunk/blender/source/kernel/CMakeLists.txt
trunk/blender/source/kernel/gen_system/SYS_SingletonSystem.cpp
trunk/blender/source/kernel/gen_system/SYS_SingletonSystem.h
Removed Paths:
-------------
trunk/blender/source/kernel/gen_system/GEN_DataCache.h
trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.cpp
trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.h
trunk/blender/source/kernel/gen_system/GEN_SmartPtr.h
Modified: trunk/blender/source/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/kernel/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
+++ trunk/blender/source/kernel/CMakeLists.txt 2010-11-18 12:54:05 UTC (rev 33157)
@@ -35,7 +35,6 @@
SET(SRC
gen_messaging/intern/messaging.c
gen_system/GEN_HashedPtr.cpp
- gen_system/GEN_Matrix4x4.cpp
gen_system/SYS_SingletonSystem.cpp
gen_system/SYS_System.cpp
)
Deleted: trunk/blender/source/kernel/gen_system/GEN_DataCache.h
===================================================================
--- trunk/blender/source/kernel/gen_system/GEN_DataCache.h 2010-11-18 11:42:05 UTC (rev 33156)
+++ trunk/blender/source/kernel/gen_system/GEN_DataCache.h 2010-11-18 12:54:05 UTC (rev 33157)
@@ -1,76 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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 __GEN_DATACACHE_H
-#define __GEN_DATACACHE_H
-
-#include "STR_HashedString.h"
-#include "GEN_Map.h"
-
-template <class T>
-class GEN_DataCache
-{
- GEN_Map<STR_HashedString,T*> m_dataCache;
- virtual T* LoadData(const STR_String& name)=0;
- virtual void FreeCacheObjects()=0;
-
-public:
- GEN_DataCache() {};
- virtual ~GEN_DataCache() {};
-
- T* GetData(const STR_String& paramname)
- {
- T* result=NULL;
-
- T** resultptr = m_dataCache[paramname];
- if (resultptr)
- {
- result = *resultptr;
- }
-
- else
- {
- result = LoadData(paramname);
- if (result)
- {
- m_dataCache.insert(paramname,result);
- }
- }
-
- return result;
- }
-
- virtual void ClearCache()
- {
- FreeCacheObjects();
- m_dataCache.clear();
- }
-};
-
-#endif //__GEN_DATACACHE_H
-
Deleted: trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.cpp
===================================================================
--- trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.cpp 2010-11-18 11:42:05 UTC (rev 33156)
+++ trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.cpp 2010-11-18 12:54:05 UTC (rev 33157)
@@ -1,202 +0,0 @@
-/**
- * $Id$
- * ***** 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 "GEN_Matrix4x4.h"
-
-GEN_Matrix4x4::GEN_Matrix4x4()
-{
- Identity();
-}
-
-
-
-GEN_Matrix4x4::GEN_Matrix4x4(const float value[4][4])
-{
- for (int i=0;i<4;i++)
- {
- for (int j=0;j<4;j++)
- m_V[i][j] = value[i][j];
- }
-}
-
-
-
-GEN_Matrix4x4::GEN_Matrix4x4(const double value[16])
-{
- for (int i=0;i<16;i++)
- m_Vflat[i] = value[i];
-}
-
-
-
-GEN_Matrix4x4::GEN_Matrix4x4(const GEN_Matrix4x4& other)
-{
- SetMatrix(other);
-}
-
-
-
-GEN_Matrix4x4::GEN_Matrix4x4(const MT_Point3& orig,
- const MT_Vector3& dir,
- const MT_Vector3 up)
-{
- MT_Vector3 z = -(dir.normalized());
- MT_Vector3 x = (up.cross(z)).normalized();
- MT_Vector3 y = (z.cross(x));
-
- m_V[0][0] = x.x();
- m_V[0][1] = y.x();
- m_V[0][2] = z.x();
- m_V[0][3] = 0.0f;
-
- m_V[1][0] = x.y();
- m_V[1][1] = y.y();
- m_V[1][2] = z.y();
- m_V[1][3] = 0.0f;
-
- m_V[2][0] = x.z();
- m_V[2][1] = y.z();
- m_V[2][2] = z.z();
- m_V[2][3] = 0.0f;
-
- m_V[3][0] = orig.x();//0.0f;
- m_V[3][1] = orig.y();//0.0f;
- m_V[3][2] = orig.z();//0.0f;
- m_V[3][3] = 1.0f;
-
- //Translate(-orig);
-}
-
-
-
-MT_Vector3 GEN_Matrix4x4::GetRight() const
-{
- return MT_Vector3(m_V[0][0], m_V[0][1], m_V[0][2]);
-}
-
-
-
-MT_Vector3 GEN_Matrix4x4::GetUp() const
-{
- return MT_Vector3(m_V[1][0], m_V[1][1], m_V[1][2]);
-}
-
-
-
-MT_Vector3 GEN_Matrix4x4::GetDir() const
-{
- return MT_Vector3(m_V[2][0], m_V[2][1], m_V[2][2]);
-}
-
-
-
-MT_Point3 GEN_Matrix4x4::GetPos() const
-{
- return MT_Point3(m_V[3][0], m_V[3][1], m_V[3][2]);
-}
-
-
-
-void GEN_Matrix4x4::Identity()
-{
- for (int i=0; i<4; i++)
- {
- for (int j=0; j<4; j++)
- m_V[i][j] = (i==j?1.0f:0.0f);
- }
-}
-
-
-
-void GEN_Matrix4x4::SetMatrix(const GEN_Matrix4x4& other)
-{
- for (int i=0; i<16; i++)
- m_Vflat[i] = other.m_Vflat[i];
-}
-
-
-
-double* GEN_Matrix4x4::getPointer()
-{
- return &m_V[0][0];
-}
-
-
-
-const double* GEN_Matrix4x4::getPointer() const
-{
- return &m_V[0][0];
-}
-
-
-
-void GEN_Matrix4x4::setElem(int pos,double newvalue)
-{
- m_Vflat[pos] = newvalue;
-}
-
-
-
-
-
-GEN_Matrix4x4 GEN_Matrix4x4::Perspective(MT_Scalar inLeft,
-MT_Scalar inRight,
-MT_Scalar inBottom,
-MT_Scalar inTop,
-MT_Scalar inNear,
-MT_Scalar inFar)
-{
-
- GEN_Matrix4x4 mat;
-
- // Column 0
- mat(0, 0) = -(2.0*inNear) / (inRight-inLeft);
- mat(1, 0) = 0;
- mat(2, 0) = 0;
- mat(3, 0) = 0;
-
- // Column 1
- mat(0, 1) = 0;
- mat(1, 1) = (2.0*inNear) / (inTop-inBottom);
- mat(2, 1) = 0;
- mat(3, 1) = 0;
-
- // Column 2
- mat(0, 2) = (inRight+inLeft) / (inRight-inLeft);
- mat(1, 2) = (inTop+inBottom) / (inTop-inBottom);
- mat(2, 2) = -(inFar+inNear) / (inFar-inNear);
- mat(3, 2) = -1;
-
- // Column 3
- mat(0, 3) = 0;
- mat(1, 3) = 0;
- mat(2, 3) = -(2.0*inFar*inNear) / (inFar-inNear);
- mat(3, 3) = 0;
-
- return mat;
-}
Deleted: trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.h
===================================================================
--- trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.h 2010-11-18 11:42:05 UTC (rev 33156)
+++ trunk/blender/source/kernel/gen_system/GEN_Matrix4x4.h 2010-11-18 12:54:05 UTC (rev 33157)
@@ -1,76 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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 GEN_MATRIX4X4
-#define GEN_MATRIX4X4
-
-#include "MT_Point3.h"
-
-class GEN_Matrix4x4
-{
-public:
- // creators.
- GEN_Matrix4x4();
- GEN_Matrix4x4(const float value[4][4]);
- GEN_Matrix4x4(const double value[16]);
- GEN_Matrix4x4(const GEN_Matrix4x4 & other);
- GEN_Matrix4x4(const MT_Point3& orig,
- const MT_Vector3& dir,
- const MT_Vector3 up);
-
- void Identity();
- void SetMatrix(const GEN_Matrix4x4 & other);
- double* getPointer();
- const double* getPointer() const;
- void setElem(int pos,double newvalue);
-
-
- MT_Vector3 GetRight() const;
- MT_Vector3 GetUp() const;
- MT_Vector3 GetDir() const;
- MT_Point3 GetPos() const;
- void SetPos(const MT_Vector3 & v);
-
- double& operator () (int row,int col) { return m_V[col][row]; }
-
- static GEN_Matrix4x4 Perspective(MT_Scalar inLeft,
- MT_Scalar inRight,
- MT_Scalar inBottom,
- MT_Scalar inTop,
- MT_Scalar inNear,
- MT_Scalar inFar);
-protected:
- union
- {
- double m_V[4][4];
- double m_Vflat[16];
- };
-};
-
-#endif //GEN_MATRIX4X4
-
Deleted: trunk/blender/source/kernel/gen_system/GEN_SmartPtr.h
===================================================================
--- trunk/blender/source/kernel/gen_system/GEN_SmartPtr.h 2010-11-18 11:42:05 UTC (rev 33156)
+++ trunk/blender/source/kernel/gen_system/GEN_SmartPtr.h 2010-11-18 12:54:05 UTC (rev 33157)
@@ -1,233 +0,0 @@
-#ifndef NAN_INCLUDED_GEN_SmartPtr_h
-#define NAN_INCLUDED_GEN_SmartPtr_h
-
-/**
- * $Id$
- *
- * ***** 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 *****
- *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list