[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36523] trunk/blender: Code cleanup: remove source/kernel module, this wasn't really the kernel of

Brecht Van Lommel brechtvanlommel at pandora.be
Fri May 6 22:18:43 CEST 2011


Revision: 36523
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36523
Author:   blendix
Date:     2011-05-06 20:18:42 +0000 (Fri, 06 May 2011)
Log Message:
-----------
Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/doc/doxygen/doxygen.source
    trunk/blender/intern/container/CMakeLists.txt
    trunk/blender/intern/container/CTR_Map.h
    trunk/blender/intern/container/SConscript
    trunk/blender/source/CMakeLists.txt
    trunk/blender/source/SConscript
    trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
    trunk/blender/source/blender/editors/space_view3d/SConscript
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c
    trunk/blender/source/blender/readblenfile/CMakeLists.txt
    trunk/blender/source/blender/readblenfile/SConscript
    trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
    trunk/blender/source/blender/render/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/SConscript
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/creator/SConscript
    trunk/blender/source/creator/creator.c
    trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    trunk/blender/source/gameengine/BlenderRoutines/SConscript
    trunk/blender/source/gameengine/Converter/BL_ActionActuator.h
    trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
    trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h
    trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h
    trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h
    trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
    trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
    trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
    trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
    trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
    trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
    trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
    trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
    trunk/blender/source/gameengine/Converter/CMakeLists.txt
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
    trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
    trunk/blender/source/gameengine/Converter/SConscript
    trunk/blender/source/gameengine/Expressions/CMakeLists.txt
    trunk/blender/source/gameengine/Expressions/SConscript
    trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
    trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
    trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
    trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
    trunk/blender/source/gameengine/GameLogic/SConscript
    trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    trunk/blender/source/gameengine/GamePlayer/common/SConscript
    trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
    trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
    trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
    trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
    trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
    trunk/blender/source/gameengine/Ketsji/KX_Scene.h
    trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
    trunk/blender/source/gameengine/Ketsji/SConscript
    trunk/blender/source/gameengine/Network/CMakeLists.txt
    trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    trunk/blender/source/gameengine/Network/LoopBackNetwork/SConscript
    trunk/blender/source/gameengine/Network/NG_NetworkScene.h
    trunk/blender/source/gameengine/Network/SConscript
    trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
    trunk/blender/source/gameengine/Physics/Bullet/SConscript
    trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
    trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
    trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
    trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    trunk/blender/source/gameengine/Rasterizer/SConscript
    trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
    trunk/blender/source/gameengine/VideoTexture/SConscript

Added Paths:
-----------
    trunk/blender/intern/container/CTR_HashedPtr.h
    trunk/blender/source/gameengine/BlenderRoutines/BL_System.cpp
    trunk/blender/source/gameengine/BlenderRoutines/BL_System.h

Removed Paths:
-------------
    trunk/blender/source/kernel/

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/SConstruct	2011-05-06 20:18:42 UTC (rev 36523)
@@ -568,9 +568,10 @@
 plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
 
 plugininstall = []
-for targetdir,srcfile in zip(plugtargetlist, pluglist):
-    td, tf = os.path.split(targetdir)
-    plugininstall.append(env.Install(dir=td, source=srcfile))
+# plugins in blender 2.5 don't work at the moment.
+#for targetdir,srcfile in zip(plugtargetlist, pluglist):
+#    td, tf = os.path.split(targetdir)
+#    plugininstall.append(env.Install(dir=td, source=srcfile))
 
 textlist = []
 texttargetlist = []

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2011-05-06 20:18:42 UTC (rev 36523)
@@ -14,7 +14,7 @@
 ###################     Cocoa & architecture settings      ##################
 #############################################################################
 WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
 
 
 cmd = 'uname -p'

Modified: trunk/blender/doc/doxygen/doxygen.source
===================================================================
--- trunk/blender/doc/doxygen/doxygen.source	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/doc/doxygen/doxygen.source	2011-05-06 20:18:42 UTC (rev 36523)
@@ -342,17 +342,5 @@
 
 /* ================================ */
 
-/** \defgroup kernel kernel */
-
-/** \defgroup genmess gen_messaging
- *  \ingroup kernel
- */
-
-/** \defgroup gensys gen_system
- *  \ingroup kernel
- */
-
-/* ================================ */
-
 /** \defgroup undoc Undocumented
  *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */

Modified: trunk/blender/intern/container/CMakeLists.txt
===================================================================
--- trunk/blender/intern/container/CMakeLists.txt	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/intern/container/CMakeLists.txt	2011-05-06 20:18:42 UTC (rev 36523)
@@ -26,11 +26,13 @@
 
 set(INC
 	.
+	../guardedalloc
 )
 
 set(SRC
 	intern/CTR_List.cpp
 
+	CTR_HashedPtr.h
 	CTR_List.h
 	CTR_Map.h
 	CTR_TaggedIndex.h

Copied: trunk/blender/intern/container/CTR_HashedPtr.h (from rev 36518, trunk/blender/source/kernel/gen_system/GEN_HashedPtr.h)
===================================================================
--- trunk/blender/intern/container/CTR_HashedPtr.h	                        (rev 0)
+++ trunk/blender/intern/container/CTR_HashedPtr.h	2011-05-06 20:18:42 UTC (rev 36523)
@@ -0,0 +1,57 @@
+/*
+ * $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 *****
+ *
+ */
+
+/** \file container/CTR_HashedPtr.h
+ *  \ingroup ctr
+ */
+
+#ifndef CTR_HASHEDPTR_H
+#define CTR_HASHEDPTR_H
+
+#include <stdlib.h>
+
+inline unsigned int CTR_Hash(void *inDWord)
+{
+	size_t key = (size_t)inDWord;
+	return (unsigned int)(key ^ (key>>4));
+}
+
+class CTR_HashedPtr
+{
+	void* m_valptr;
+public:
+	CTR_HashedPtr(void* val) : m_valptr(val) {};
+	unsigned int hash() const { return CTR_Hash(m_valptr);};
+	inline friend bool operator ==(const CTR_HashedPtr & rhs, const CTR_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
+	void *getValue() const { return m_valptr; }
+};
+
+#endif //CTR_HASHEDPTR_H
+

Modified: trunk/blender/intern/container/CTR_Map.h
===================================================================
--- trunk/blender/intern/container/CTR_Map.h	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/intern/container/CTR_Map.h	2011-05-06 20:18:42 UTC (rev 36523)
@@ -55,6 +55,19 @@
             m_buckets[i] = 0;
         }
     }
+
+	CTR_Map(const CTR_Map& map)
+	{
+		m_num_buckets = map.m_num_buckets;
+		m_buckets = new Entry *[m_num_buckets];
+
+		for (int i = 0; i < m_num_buckets; ++i) {
+			m_buckets[i] = 0;
+
+			for(Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
+				insert(entry->m_key, entry->m_value);
+		}
+	}
     
     int size() { 
         int count=0;
@@ -87,6 +100,24 @@
         }
         return 0;
     }
+
+    Key* getKey(int index) {
+        int count=0;
+        for (int i=0;i<m_num_buckets;i++)
+        {
+            Entry* bucket = m_buckets[i];
+            while(bucket)
+            {
+                if (count==index)
+                {
+                    return &bucket->m_key;
+                }
+                bucket = bucket->m_next;
+                count++;
+            }
+        }
+        return 0;
+    }
     
     void clear() {
         for (int i = 0; i < m_num_buckets; ++i) {

Modified: trunk/blender/intern/container/SConscript
===================================================================
--- trunk/blender/intern/container/SConscript	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/intern/container/SConscript	2011-05-06 20:18:42 UTC (rev 36523)
@@ -2,6 +2,6 @@
 Import ('env')
 
 sources = env.Glob('intern/*.cpp')
-incs = '.'
+incs = '. #intern/guardedalloc'
 
 env.BlenderLib ('bf_intern_ctr', sources, Split(incs) , [], libtype='intern', priority = 10 )

Modified: trunk/blender/source/CMakeLists.txt
===================================================================
--- trunk/blender/source/CMakeLists.txt	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/CMakeLists.txt	2011-05-06 20:18:42 UTC (rev 36523)
@@ -27,7 +27,6 @@
 add_subdirectory(blender)
 
 if(WITH_GAMEENGINE)
-	add_subdirectory(kernel)
 	add_subdirectory(gameengine)
 endif()
 	

Modified: trunk/blender/source/SConscript
===================================================================
--- trunk/blender/source/SConscript	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/SConscript	2011-05-06 20:18:42 UTC (rev 36523)
@@ -4,7 +4,7 @@
 SConscript(['blender/SConscript', 'creator/SConscript'])
 
 if env['WITH_BF_GAMEENGINE']:
-    SConscript (['kernel/SConscript', 'gameengine/SConscript'])
+    SConscript (['gameengine/SConscript'])
 
 if env['WITH_BF_PLAYER']:
     SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])

Modified: trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt	2011-05-06 20:18:42 UTC (rev 36523)
@@ -58,7 +58,7 @@
 )
 
 if(WITH_GAMEENGINE)
-	list(APPEND INC ../../../kernel/gen_system)
+	list(APPEND INC ../../../../source/gameengine/BlenderRoutines)
 	add_definitions(-DWITH_GAMEENGINE)
 endif()
 

Modified: trunk/blender/source/blender/editors/space_view3d/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/SConscript	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/blender/editors/space_view3d/SConscript	2011-05-06 20:18:42 UTC (rev 36523)
@@ -9,7 +9,7 @@
 incs += ' ../../render/extern/include ../../blenloader'
 incs += ' ../../gpu ../../makesrna ../../blenfont'
 incs += ' #/intern/smoke/extern'
-incs += ' #source/kernel/gen_system'
+incs += ' #source/gameengine/BlenderRoutines'
 
 if env['WITH_BF_GAMEENGINE']:
     defs.append('WITH_GAMEENGINE')

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2011-05-06 20:18:42 UTC (rev 36523)
@@ -65,7 +65,7 @@
 #include "ED_armature.h"
 
 #ifdef WITH_GAMEENGINE
-#include "SYS_System.h"
+#include "BL_System.h"
 #endif
 
 #include "view3d_intern.h"	// own include
@@ -1764,9 +1764,6 @@
 	}
 }
 
-/* maybe we need this defined somewhere else */
-extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *cam_frame, int always_use_expand_framing);
-
 #endif // WITH_GAMEENGINE
 
 static int game_engine_poll(bContext *C)

Modified: trunk/blender/source/blender/readblenfile/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/readblenfile/CMakeLists.txt	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/blender/readblenfile/CMakeLists.txt	2011-05-06 20:18:42 UTC (rev 36523)
@@ -31,7 +31,6 @@
 	../blenkernel
 	../blenlib
 	../makesdna
-	../../kernel/gen_messaging
 )
 
 set(SRC

Modified: trunk/blender/source/blender/readblenfile/SConscript
===================================================================
--- trunk/blender/source/blender/readblenfile/SConscript	2011-05-06 19:45:04 UTC (rev 36522)
+++ trunk/blender/source/blender/readblenfile/SConscript	2011-05-06 20:18:42 UTC (rev 36523)
@@ -3,6 +3,6 @@
 
 sources = env.Glob('intern/*.c')
 
-incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
+incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna'
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list