forked from bartvdbraak/blender
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.
This commit is contained in:
parent
4eb1b5256e
commit
cb12337363
@ -568,9 +568,10 @@ pluglist.append('source/blender/blenpluginapi/plugin.DEF')
|
||||
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 = []
|
||||
|
@ -14,7 +14,7 @@ USE_SDK=True
|
||||
################### 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'
|
||||
|
@ -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. */
|
||||
|
@ -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
|
||||
|
@ -28,24 +28,30 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/** \file kernel/gen_system/GEN_HashedPtr.h
|
||||
* \ingroup gensys
|
||||
/** \file container/CTR_HashedPtr.h
|
||||
* \ingroup ctr
|
||||
*/
|
||||
|
||||
#ifndef __GEN_HASHEDPTR
|
||||
#define __GEN_HASHEDPTR
|
||||
#ifndef CTR_HASHEDPTR_H
|
||||
#define CTR_HASHEDPTR_H
|
||||
|
||||
unsigned int GEN_Hash(void * inDWord);
|
||||
#include <stdlib.h>
|
||||
|
||||
class GEN_HashedPtr
|
||||
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:
|
||||
GEN_HashedPtr(void* val) : m_valptr(val) {};
|
||||
unsigned int hash() const { return GEN_Hash(m_valptr);};
|
||||
inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
|
||||
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 //__GEN_HASHEDPTR
|
||||
#endif //CTR_HASHEDPTR_H
|
||||
|
@ -55,6 +55,19 @@ public:
|
||||
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 @@ public:
|
||||
}
|
||||
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) {
|
||||
|
@ -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 )
|
||||
|
@ -27,7 +27,6 @@
|
||||
add_subdirectory(blender)
|
||||
|
||||
if(WITH_GAMEENGINE)
|
||||
add_subdirectory(kernel)
|
||||
add_subdirectory(gameengine)
|
||||
endif()
|
||||
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
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'])
|
||||
|
@ -58,7 +58,7 @@ set(SRC
|
||||
)
|
||||
|
||||
if(WITH_GAMEENGINE)
|
||||
list(APPEND INC ../../../kernel/gen_system)
|
||||
list(APPEND INC ../../../../source/gameengine/BlenderRoutines)
|
||||
add_definitions(-DWITH_GAMEENGINE)
|
||||
endif()
|
||||
|
||||
|
@ -9,7 +9,7 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
||||
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')
|
||||
|
@ -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 @@ static void game_set_commmandline_options(GameData *gm)
|
||||
}
|
||||
}
|
||||
|
||||
/* 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)
|
||||
|
@ -31,7 +31,6 @@ set(INC
|
||||
../blenkernel
|
||||
../blenlib
|
||||
../makesdna
|
||||
../../kernel/gen_messaging
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -3,6 +3,6 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('intern/*.c')
|
||||
|
||||
incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
|
||||
incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna'
|
||||
|
||||
env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,5] )
|
||||
|
@ -34,7 +34,6 @@
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include "GEN_messaging.h"
|
||||
|
||||
int BLO_readblenfilememory( char *fromBuffer, int fromBufferSize);
|
||||
int BLO_readblenfilename( char *fileName);
|
||||
@ -47,7 +46,7 @@ BLO_readblenfilememory(
|
||||
char *fromBuffer, int fromBufferSize)
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
fprintf(GEN_errorstream,
|
||||
fprintf(stderr,
|
||||
"Error BLO_readblenfilename is a stub\n");
|
||||
#endif
|
||||
return(1);
|
||||
@ -58,7 +57,7 @@ BLO_readblenfilename(
|
||||
char *fileName)
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
fprintf(GEN_errorstream,
|
||||
fprintf(stderr,
|
||||
"Error BLO_readblenfilename is a stub\n");
|
||||
#endif
|
||||
return(1);
|
||||
@ -69,7 +68,7 @@ BLO_readblenfilehandle(
|
||||
int fileHandle)
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
fprintf(GEN_errorstream,
|
||||
fprintf(stderr,
|
||||
"Error BLO_readblenfilehandle is a stub\n");
|
||||
#endif
|
||||
return(1);
|
||||
@ -80,7 +79,7 @@ BLO_is_a_runtime(
|
||||
char *file)
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
fprintf(GEN_errorstream,
|
||||
fprintf(stderr,
|
||||
"Error BLO_is_a_runtime is a stub\n");
|
||||
#endif
|
||||
return 0;
|
||||
@ -91,7 +90,7 @@ BLO_read_runtime(
|
||||
char *file)
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
fprintf(GEN_errorstream,
|
||||
fprintf(stderr,
|
||||
"Error BLO_read_runtime is a stub\n");
|
||||
#endif
|
||||
return 0;
|
||||
|
@ -36,7 +36,6 @@ set(INC
|
||||
../makesrna
|
||||
../blenkernel
|
||||
../imbuf
|
||||
../../kernel/gen_messaging
|
||||
../../../intern/smoke/extern
|
||||
../../../intern/mikktspace
|
||||
../../../intern/guardedalloc
|
||||
|
@ -37,12 +37,12 @@ set(INC
|
||||
../blenloader
|
||||
../editors/include
|
||||
../render/extern/include
|
||||
../../kernel/gen_system
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/memutil
|
||||
../../../intern/elbeem/extern
|
||||
../../../intern/ghost
|
||||
../../../intern/opennl/extern
|
||||
../../../source/gameengine/BlenderRoutines
|
||||
${ZLIB_INCLUDE_DIRS}
|
||||
${OPENGL_INCLUDE_DIR}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
|
@ -8,11 +8,12 @@ sources = env.Glob('intern/*.c')
|
||||
|
||||
incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
|
||||
incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
|
||||
incs += ' ../radiosity/extern/include ../../kernel/gen_system'
|
||||
incs += ' ../radiosity/extern/include'
|
||||
incs += ' ../makesrna ../gpu ../blenfont'
|
||||
|
||||
incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
|
||||
incs += ' #/intern/elbeem #/extern/glew/include'
|
||||
incs += ' #source/gameengine/BlenderRoutines'
|
||||
|
||||
incs += ' ' + env['BF_ZLIB_INC']
|
||||
|
||||
|
@ -72,7 +72,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef WITH_GAMEENGINE
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
#endif
|
||||
#include "GHOST_Path-api.h"
|
||||
#include "GHOST_C-api.h"
|
||||
|
@ -110,7 +110,6 @@ endif()
|
||||
bf_intern_smoke
|
||||
bf_modifiers
|
||||
bf_intern_moto
|
||||
bf_gen_system
|
||||
bf_nodes
|
||||
bf_gpu
|
||||
bf_imbuf
|
||||
|
@ -82,10 +82,7 @@ if(WITH_PYTHON)
|
||||
endif()
|
||||
|
||||
if(WITH_GAMEENGINE)
|
||||
blender_include_dirs(
|
||||
../kernel/gen_messaging
|
||||
../kernel/gen_system
|
||||
)
|
||||
blender_include_dirs(../gameengine/BlenderRoutines)
|
||||
|
||||
add_definitions(-DWITH_GAMEENGINE)
|
||||
endif()
|
||||
@ -778,7 +775,6 @@ endif()
|
||||
bf_collada
|
||||
bf_intern_bsp
|
||||
bf_intern_bop
|
||||
bf_gen_system
|
||||
bf_intern_decimate
|
||||
bf_intern_elbeem
|
||||
bf_intern_ik
|
||||
@ -800,7 +796,6 @@ endif()
|
||||
ge_logic_expressions
|
||||
ge_scenegraph
|
||||
ge_logic_network
|
||||
bf_gen_system
|
||||
bf_python # duplicate for BPY_driver_exec
|
||||
ge_logic_ngnetwork
|
||||
extern_bullet
|
||||
|
@ -7,8 +7,8 @@ sources = 'creator.c'
|
||||
incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
|
||||
incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf'
|
||||
incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager'
|
||||
incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging'
|
||||
incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
|
||||
incs += ' ../blender/makesdna ../blender/makesrna'
|
||||
incs += ' ../gameengine/BlenderRoutines #/extern/glew/include ../blender/gpu'
|
||||
incs += ' ' + env['BF_OPENGL_INC']
|
||||
|
||||
defs = []
|
||||
|
@ -108,8 +108,7 @@
|
||||
|
||||
/* for passing information between creator and gameengine */
|
||||
#ifdef WITH_GAMEENGINE
|
||||
#include "GEN_messaging.h"
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
#else /* dummy */
|
||||
#define SYS_SystemHandle int
|
||||
#endif
|
||||
@ -1216,7 +1215,6 @@ int main(int argc, const char **argv)
|
||||
|
||||
#ifdef WITH_GAMEENGINE
|
||||
syshandle = SYS_GetSystem();
|
||||
GEN_init_messaging_system();
|
||||
#else
|
||||
syshandle= 0;
|
||||
#endif
|
||||
|
@ -64,7 +64,7 @@
|
||||
|
||||
#include "NG_LoopBackNetworkDeviceInterface.h"
|
||||
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
|
||||
#include "GPU_extensions.h"
|
||||
#include "Value.h"
|
||||
|
@ -25,55 +25,80 @@
|
||||
* Contributor(s): none yet.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
* System specific information / access.
|
||||
* Interface to the commandline arguments
|
||||
*/
|
||||
|
||||
/** \file kernel/gen_system/SYS_System.cpp
|
||||
* \ingroup gensys
|
||||
/** \file gameengine/BlenderRoutines/BL_System.cpp
|
||||
* \ingroup blroutines
|
||||
*/
|
||||
|
||||
#include "SYS_System.h"
|
||||
#include "SYS_SingletonSystem.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "BL_System.h"
|
||||
|
||||
struct SingletonSystem {
|
||||
CTR_Map<STR_HashedString,int> int_params;
|
||||
CTR_Map<STR_HashedString,float> float_params;
|
||||
CTR_Map<STR_HashedString,STR_String> string_params;
|
||||
};
|
||||
|
||||
static SingletonSystem *_system_instance = NULL;
|
||||
|
||||
SYS_SystemHandle SYS_GetSystem()
|
||||
{
|
||||
return (SYS_SystemHandle) SYS_SingletonSystem::Instance();
|
||||
if(!_system_instance)
|
||||
_system_instance = new SingletonSystem();
|
||||
|
||||
return (SYS_SystemHandle)_system_instance;
|
||||
}
|
||||
|
||||
void SYS_DeleteSystem(SYS_SystemHandle sys)
|
||||
{
|
||||
if (sys) {
|
||||
((SYS_SingletonSystem *) sys)->Destruct();
|
||||
if(_system_instance) {
|
||||
delete _system_instance;
|
||||
_system_instance = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
int SYS_GetCommandLineInt(SYS_SystemHandle sys, const char *paramname, int defaultvalue)
|
||||
{
|
||||
return ((SYS_SingletonSystem *) sys)->SYS_GetCommandLineInt(paramname, defaultvalue);
|
||||
int *result = ((SingletonSystem *)sys)->int_params[paramname];
|
||||
if(result)
|
||||
return *result;
|
||||
|
||||
return defaultvalue;
|
||||
}
|
||||
|
||||
float SYS_GetCommandLineFloat(SYS_SystemHandle sys, const char *paramname, float defaultvalue)
|
||||
{
|
||||
return ((SYS_SingletonSystem *) sys)->SYS_GetCommandLineFloat(paramname, defaultvalue);
|
||||
float *result = ((SingletonSystem *)sys)->float_params[paramname];
|
||||
if(result)
|
||||
return *result;
|
||||
|
||||
return defaultvalue;
|
||||
}
|
||||
|
||||
const char *SYS_GetCommandLineString(SYS_SystemHandle sys, const char *paramname, const char *defaultvalue)
|
||||
{
|
||||
return ((SYS_SingletonSystem *) sys)->SYS_GetCommandLineString(paramname, defaultvalue);
|
||||
STR_String *result = ((SingletonSystem *)sys)->string_params[paramname];
|
||||
if(result)
|
||||
return *result;
|
||||
|
||||
return defaultvalue;
|
||||
}
|
||||
|
||||
void SYS_WriteCommandLineInt(SYS_SystemHandle sys, const char *paramname, int value)
|
||||
{
|
||||
((SYS_SingletonSystem *) sys)->SYS_WriteCommandLineInt(paramname, value);
|
||||
((SingletonSystem *)sys)->int_params.insert(paramname, value);
|
||||
}
|
||||
|
||||
void SYS_WriteCommandLineFloat(SYS_SystemHandle sys, const char *paramname, float value)
|
||||
{
|
||||
((SYS_SingletonSystem *) sys)->SYS_WriteCommandLineFloat(paramname, value);
|
||||
((SingletonSystem *)sys)->float_params.insert(paramname, value);
|
||||
}
|
||||
|
||||
void SYS_WriteCommandLineString(SYS_SystemHandle sys, const char *paramname, const char *value)
|
||||
{
|
||||
((SYS_SingletonSystem *) sys)->SYS_WriteCommandLineString(paramname, value);
|
||||
((SingletonSystem *)sys)->string_params.insert(paramname, value);
|
||||
}
|
||||
|
@ -29,31 +29,21 @@
|
||||
* Interface to the commandline arguments
|
||||
*/
|
||||
|
||||
/** \file kernel/gen_system/SYS_System.h
|
||||
* \ingroup gensys
|
||||
/** \file gameengine/BlenderRoutines/BL_System.h
|
||||
* \ingroup blroutines
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __SYSTEM_INCLUDE
|
||||
#define __SYSTEM_INCLUDE
|
||||
|
||||
#define SYS_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
|
||||
|
||||
SYS_DECLARE_HANDLE(SYS_SystemHandle);
|
||||
|
||||
/**
|
||||
System specific information / access.
|
||||
For now, only used for commandline parameters.
|
||||
One of the available implementations must be linked to the application
|
||||
that uses this system routines.
|
||||
Please note that this protocol/interface is just for testing,
|
||||
it needs discussion in the development group for a more final version.
|
||||
*/
|
||||
#ifndef BL_SYSTEM_H
|
||||
#define BL_SYSTEM_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Game Engine command line parameters */
|
||||
|
||||
typedef void* SYS_SystemHandle;
|
||||
|
||||
extern SYS_SystemHandle SYS_GetSystem(void);
|
||||
extern void SYS_DeleteSystem(SYS_SystemHandle sys);
|
||||
|
||||
@ -65,9 +55,18 @@ extern void SYS_WriteCommandLineInt(SYS_SystemHandle sys, const char *paramname,
|
||||
extern void SYS_WriteCommandLineFloat(SYS_SystemHandle sys, const char *paramname, float value);
|
||||
extern void SYS_WriteCommandLineString(SYS_SystemHandle sys, const char *paramname, const char *value);
|
||||
|
||||
/* Start game engine */
|
||||
|
||||
struct bContext;
|
||||
struct ARegion;
|
||||
struct rcti;
|
||||
|
||||
extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar,
|
||||
struct rcti *cam_frame, int always_use_expand_framing);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif //__SYSTEM_INCLUDE
|
||||
#endif /* BL_SYSTEM_H */
|
||||
|
@ -1,8 +1,8 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/container
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/audaspace/intern
|
||||
../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
||||
@ -34,6 +34,7 @@ set(INC
|
||||
|
||||
set(SRC
|
||||
BL_KetsjiEmbedStart.cpp
|
||||
BL_System.cpp
|
||||
KX_BlenderCanvas.cpp
|
||||
KX_BlenderGL.cpp
|
||||
KX_BlenderInputDevice.cpp
|
||||
@ -42,6 +43,7 @@ set(SRC
|
||||
KX_BlenderRenderTools.cpp
|
||||
KX_BlenderSystem.cpp
|
||||
|
||||
BL_System.h
|
||||
KX_BlenderCanvas.h
|
||||
KX_BlenderGL.h
|
||||
KX_BlenderInputDevice.h
|
||||
|
@ -4,10 +4,10 @@ Import ('env')
|
||||
sources = env.Glob('*.cpp')
|
||||
defs = [ 'GLEW_STATIC' ]
|
||||
|
||||
incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
|
||||
incs = '. #intern/string #intern/guardedalloc'
|
||||
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
|
||||
incs += ' #source/gameengine/Converter #source/blender/imbuf'
|
||||
incs += ' #intern/ghost/include'
|
||||
incs += ' #intern/ghost/include #intern/container'
|
||||
incs += ' #intern/audaspace/intern'
|
||||
incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib'
|
||||
incs += ' #source/blender/blenkernel #source/blender'
|
||||
|
@ -34,7 +34,7 @@
|
||||
#ifndef BL_ACTIONACTUATOR
|
||||
#define BL_ACTIONACTUATOR
|
||||
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "SCA_IActuator.h"
|
||||
#include "DNA_actuator_types.h"
|
||||
#include "MT_Point3.h"
|
||||
|
@ -115,7 +115,7 @@ bool BL_ArmatureActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return res;
|
||||
}
|
||||
|
||||
void BL_ArmatureActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void BL_ArmatureActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_gametarget];
|
||||
if (h_obj) {
|
||||
|
@ -67,7 +67,7 @@ public:
|
||||
};
|
||||
virtual void ProcessReplica();
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
virtual bool Update(double curtime, bool frame);
|
||||
virtual void ReParent(SCA_IObject* parent);
|
||||
|
||||
|
@ -35,8 +35,8 @@
|
||||
#define __BL_ARMATURECHANNEL
|
||||
|
||||
#include "DNA_action_types.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "PyObjectPlus.h"
|
||||
|
||||
class SCA_IObject;
|
||||
|
@ -147,7 +147,7 @@ void BL_ArmatureConstraint::ReParent(BL_ArmatureObject* armature)
|
||||
}
|
||||
}
|
||||
|
||||
void BL_ArmatureConstraint::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void BL_ArmatureConstraint::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_target];
|
||||
if (h_obj) {
|
||||
|
@ -35,8 +35,8 @@
|
||||
#define __BL_ARMATURECONSTRAINT
|
||||
|
||||
#include "DNA_constraint_types.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "PyObjectPlus.h"
|
||||
|
||||
class SCA_IObject;
|
||||
@ -80,7 +80,7 @@ public:
|
||||
|
||||
BL_ArmatureConstraint* GetReplica() const;
|
||||
void ReParent(BL_ArmatureObject* armature);
|
||||
void Relink(GEN_Map<GEN_HashedPtr, void*> *map);
|
||||
void Relink(CTR_Map<CTR_HashedPtr, void*> *map);
|
||||
bool UnlinkObject(SCA_IObject* clientobj);
|
||||
|
||||
void UpdateTarget();
|
||||
|
@ -45,8 +45,8 @@
|
||||
#include "BKE_armature.h"
|
||||
|
||||
#include "BKE_constraint.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "DNA_action_types.h"
|
||||
#include "DNA_armature_types.h"
|
||||
@ -439,7 +439,7 @@ void BL_ArmatureObject::ReParentLogic()
|
||||
KX_GameObject::ReParentLogic();
|
||||
}
|
||||
|
||||
void BL_ArmatureObject::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void BL_ArmatureObject::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
SG_DList::iterator<BL_ArmatureConstraint> cit(m_controlledConstraints);
|
||||
for (cit.begin(); !cit.end(); ++cit) {
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
short GetActivePriority();
|
||||
virtual void ProcessReplica();
|
||||
virtual void ReParentLogic();
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
|
||||
class BL_ActionActuator * GetActiveAction();
|
||||
|
@ -156,7 +156,7 @@ extern "C" {
|
||||
#include "KX_ScalarInterpolator.h"
|
||||
|
||||
#include "KX_IpoConvert.h"
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
|
||||
#include "SG_Node.h"
|
||||
#include "SG_BBox.h"
|
||||
|
@ -34,7 +34,7 @@
|
||||
#ifndef __BLENDER_CONVERT
|
||||
#define __BLENDER_CONVERT
|
||||
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "STR_String.h"
|
||||
#include "KX_Python.h"
|
||||
#include "KX_PhysicsEngineEnums.h"
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
{
|
||||
return m_blendobj;
|
||||
}
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*>*map)
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*>*map)
|
||||
{
|
||||
if (m_pDeformer)
|
||||
m_pDeformer->Relink (map);
|
||||
|
@ -46,7 +46,7 @@
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "BLI_math.h"
|
||||
|
||||
@ -101,7 +101,7 @@ void BL_MeshDeformer::ProcessReplica()
|
||||
m_lastDeformUpdate = -1;
|
||||
}
|
||||
|
||||
void BL_MeshDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
|
||||
void BL_MeshDeformer::Relink(CTR_Map<class CTR_HashedPtr, void*>*map)
|
||||
{
|
||||
void **h_obj = (*map)[m_gameobj];
|
||||
|
||||
|
@ -51,7 +51,7 @@ class BL_MeshDeformer : public RAS_Deformer
|
||||
public:
|
||||
void VerifyStorage();
|
||||
void RecalcNormals();
|
||||
virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map);
|
||||
virtual void Relink(CTR_Map<class CTR_HashedPtr, void*>*map);
|
||||
BL_MeshDeformer(BL_DeformableGameObject *gameobj,
|
||||
struct Object* obj,
|
||||
class RAS_MeshObject *meshobj ):
|
||||
|
@ -38,7 +38,7 @@
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "BL_ModifierDeformer.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "RAS_IPolygonMaterial.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
|
@ -34,7 +34,7 @@
|
||||
#ifndef BL_SHAPEACTIONACTUATOR
|
||||
#define BL_SHAPEACTIONACTUATOR
|
||||
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "SCA_IActuator.h"
|
||||
#include "BL_ActionActuator.h"
|
||||
#include "MT_Point3.h"
|
||||
|
@ -38,7 +38,7 @@
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "BL_ShapeDeformer.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "RAS_IPolygonMaterial.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
|
@ -37,7 +37,7 @@
|
||||
#endif //WIN32
|
||||
|
||||
#include "BL_SkinDeformer.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "RAS_IPolygonMaterial.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
@ -108,7 +108,7 @@ BL_SkinDeformer::~BL_SkinDeformer()
|
||||
m_armobj->Release();
|
||||
}
|
||||
|
||||
void BL_SkinDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
|
||||
void BL_SkinDeformer::Relink(CTR_Map<class CTR_HashedPtr, void*>*map)
|
||||
{
|
||||
if (m_armobj) {
|
||||
void **h_obj = (*map)[m_armobj];
|
||||
|
@ -38,7 +38,7 @@
|
||||
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
|
||||
#endif //WIN32
|
||||
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "BL_MeshDeformer.h"
|
||||
#include "BL_ArmatureObject.h"
|
||||
|
||||
@ -54,7 +54,7 @@ class BL_SkinDeformer : public BL_MeshDeformer
|
||||
{
|
||||
public:
|
||||
// void SetArmatureController (BL_ArmatureController *cont);
|
||||
virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map);
|
||||
virtual void Relink(CTR_Map<class CTR_HashedPtr, void*>*map);
|
||||
void SetArmature (class BL_ArmatureObject *armobj);
|
||||
|
||||
BL_SkinDeformer(BL_DeformableGameObject *gameobj,
|
||||
|
@ -26,9 +26,9 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/container
|
||||
../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
||||
../../../intern/audaspace/intern
|
||||
../../../source/gameengine/Converter
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include "KX_PolygonMaterial.h"
|
||||
|
||||
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
|
||||
#include "DummyPhysicsEnvironment.h"
|
||||
|
||||
@ -1126,7 +1126,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
|
||||
|
||||
/* incase the mesh might be refered to later */
|
||||
{
|
||||
GEN_Map<STR_HashedString,void*> &mapStringToMeshes = scene->GetLogicManager()->GetMeshMap();
|
||||
CTR_Map<STR_HashedString,void*> &mapStringToMeshes = scene->GetLogicManager()->GetMeshMap();
|
||||
|
||||
for(int i=0; i<mapStringToMeshes.size(); i++)
|
||||
{
|
||||
@ -1143,7 +1143,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
|
||||
|
||||
/* Now unregister actions */
|
||||
{
|
||||
GEN_Map<STR_HashedString,void*> &mapStringToActions = scene->GetLogicManager()->GetActionMap();
|
||||
CTR_Map<STR_HashedString,void*> &mapStringToActions = scene->GetLogicManager()->GetActionMap();
|
||||
|
||||
for(int i=0; i<mapStringToActions.size(); i++)
|
||||
{
|
||||
|
@ -35,7 +35,7 @@
|
||||
#define __KX_BLENDERSCENECONVERTER_H
|
||||
|
||||
#include "KX_HashedPtr.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "KX_ISceneConverter.h"
|
||||
@ -61,12 +61,12 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
|
||||
// Should also have a list of collision shapes.
|
||||
// For the time being this is held in KX_Scene::m_shapes
|
||||
|
||||
GEN_Map<CHashedPtr,KX_GameObject*> m_map_blender_to_gameobject; /* cleared after conversion */
|
||||
GEN_Map<CHashedPtr,RAS_MeshObject*> m_map_mesh_to_gamemesh; /* cleared after conversion */
|
||||
GEN_Map<CHashedPtr,SCA_IActuator*> m_map_blender_to_gameactuator; /* cleared after conversion */
|
||||
GEN_Map<CHashedPtr,SCA_IController*>m_map_blender_to_gamecontroller; /* cleared after conversion */
|
||||
CTR_Map<CHashedPtr,KX_GameObject*> m_map_blender_to_gameobject; /* cleared after conversion */
|
||||
CTR_Map<CHashedPtr,RAS_MeshObject*> m_map_mesh_to_gamemesh; /* cleared after conversion */
|
||||
CTR_Map<CHashedPtr,SCA_IActuator*> m_map_blender_to_gameactuator; /* cleared after conversion */
|
||||
CTR_Map<CHashedPtr,SCA_IController*>m_map_blender_to_gamecontroller; /* cleared after conversion */
|
||||
|
||||
GEN_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameAdtList;
|
||||
CTR_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameAdtList;
|
||||
|
||||
Main* m_maggie;
|
||||
vector<struct Main*> m_DynamicMaggie;
|
||||
|
@ -41,8 +41,8 @@
|
||||
#include "KX_ConvertPhysicsObject.h"
|
||||
#include "KX_SoftBodyDeformer.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
|
||||
#ifdef USE_BULLET
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
#include "KX_BulletPhysicsController.h"
|
||||
#include "btBulletDynamicsCommon.h"
|
||||
|
||||
void KX_SoftBodyDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
|
||||
void KX_SoftBodyDeformer::Relink(CTR_Map<class CTR_HashedPtr, void*>*map)
|
||||
{
|
||||
void **h_obj = (*map)[m_gameobj];
|
||||
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
{
|
||||
//printf("~KX_SoftBodyDeformer\n");
|
||||
};
|
||||
virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map);
|
||||
virtual void Relink(CTR_Map<class CTR_HashedPtr, void*>*map);
|
||||
virtual bool Apply(class RAS_IPolyMaterial *polymat);
|
||||
virtual bool Update(void)
|
||||
{
|
||||
|
@ -4,7 +4,7 @@ Import ('env')
|
||||
sources = env.Glob('*.cpp')
|
||||
defs = []
|
||||
|
||||
incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
|
||||
incs = '. #intern/string #intern/guardedalloc #intern/container'
|
||||
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
|
||||
incs += ' #intern/audaspace/intern #source/gameengine/Converter'
|
||||
incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf'
|
||||
|
@ -26,7 +26,6 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/moto/include
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.cpp')
|
||||
|
||||
incs ='. #source/kernel/gen_system #intern/guardedalloc #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
|
||||
incs ='. #intern/guardedalloc #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/container
|
||||
../../../source/gameengine/Expressions
|
||||
../../../source/gameengine/SceneGraph
|
||||
../../../intern/moto/include
|
||||
|
@ -78,7 +78,7 @@ void SCA_ILogicBrick::ReParent(SCA_IObject* parent)
|
||||
m_gameobj = parent;
|
||||
}
|
||||
|
||||
void SCA_ILogicBrick::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void SCA_ILogicBrick::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
// nothing to do
|
||||
}
|
||||
|
@ -37,8 +37,8 @@
|
||||
#include "Value.h"
|
||||
#include "SCA_IObject.h"
|
||||
#include "BoolValue.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
|
||||
class NG_NetworkScene;
|
||||
class SCA_IScene;
|
||||
@ -70,7 +70,7 @@ public:
|
||||
SCA_IObject* GetParent() { return m_gameobj; }
|
||||
|
||||
virtual void ReParent(SCA_IObject* parent);
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
virtual void Delete() { Release(); }
|
||||
|
||||
// act as a BoolValue (with value IsPositiveTrigger)
|
||||
|
@ -38,12 +38,12 @@
|
||||
#endif
|
||||
|
||||
#include <vector>
|
||||
//#include "GEN_Map.h"
|
||||
//#include "CTR_Map.h"
|
||||
#include <set>
|
||||
#include <map>
|
||||
#include <list>
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "Value.h"
|
||||
#include "SG_QList.h"
|
||||
@ -85,12 +85,12 @@ class SCA_LogicManager
|
||||
|
||||
// need to find better way for this
|
||||
// also known as FactoryManager...
|
||||
GEN_Map<STR_HashedString,CValue*> m_mapStringToGameObjects;
|
||||
GEN_Map<STR_HashedString,void*> m_mapStringToMeshes;
|
||||
GEN_Map<STR_HashedString,void*> m_mapStringToActions;
|
||||
CTR_Map<STR_HashedString,CValue*> m_mapStringToGameObjects;
|
||||
CTR_Map<STR_HashedString,void*> m_mapStringToMeshes;
|
||||
CTR_Map<STR_HashedString,void*> m_mapStringToActions;
|
||||
|
||||
GEN_Map<STR_HashedString,void*> m_map_gamemeshname_to_blendobj;
|
||||
GEN_Map<CHashedPtr,void*> m_map_blendobj_to_gameobj;
|
||||
CTR_Map<STR_HashedString,void*> m_map_gamemeshname_to_blendobj;
|
||||
CTR_Map<CHashedPtr,void*> m_map_blendobj_to_gameobj;
|
||||
public:
|
||||
SCA_LogicManager();
|
||||
virtual ~SCA_LogicManager();
|
||||
@ -129,8 +129,8 @@ public:
|
||||
// for the scripting... needs a FactoryManager later (if we would have time... ;)
|
||||
void RegisterMeshName(const STR_String& meshname,void* mesh);
|
||||
void UnregisterMeshName(const STR_String& meshname,void* mesh);
|
||||
GEN_Map<STR_HashedString,void*>& GetMeshMap() { return m_mapStringToMeshes; };
|
||||
GEN_Map<STR_HashedString,void*>& GetActionMap() { return m_mapStringToActions; };
|
||||
CTR_Map<STR_HashedString,void*>& GetMeshMap() { return m_mapStringToMeshes; };
|
||||
CTR_Map<STR_HashedString,void*>& GetActionMap() { return m_mapStringToActions; };
|
||||
|
||||
void RegisterActionName(const STR_String& actname,void* action);
|
||||
|
||||
|
@ -213,7 +213,7 @@ bool SCA_PropertyActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void SCA_PropertyActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void SCA_PropertyActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_sourceObj];
|
||||
if (h_obj) {
|
||||
|
@ -77,7 +77,7 @@ public:
|
||||
|
||||
virtual void ProcessReplica();
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
|
||||
virtual bool
|
||||
Update();
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp')
|
||||
|
||||
incs = '. #/source/kernel/gen_system #/intern/string'
|
||||
incs = '. #/intern/string #intern/container'
|
||||
incs += ' #/source/gameengine/Expressions #/intern/moto/include'
|
||||
incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
|
||||
|
||||
|
@ -29,11 +29,11 @@ set(INC
|
||||
../../../../intern/string
|
||||
../../../../intern/ghost
|
||||
../../../../intern/guardedalloc
|
||||
../../../../intern/container
|
||||
../../../../intern/moto/include
|
||||
../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
||||
../../../../source/kernel/gen_system
|
||||
../../../../source/kernel/gen_messaging
|
||||
../../../../source/gameengine/Converter
|
||||
../../../../source/gameengine/BlenderRoutines
|
||||
../../../../source/blender/imbuf
|
||||
../../../../source/gameengine/Ketsji
|
||||
../../../../source/blender/blenlib
|
||||
|
@ -50,7 +50,7 @@
|
||||
|
||||
// include files needed by "KX_BlenderSceneConverter.h"
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "SCA_IActuator.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
|
||||
|
@ -19,10 +19,10 @@ incs = ['.',
|
||||
'#intern/ghost',
|
||||
'#intern/guardedalloc',
|
||||
'#intern/moto/include',
|
||||
'#intern/container',
|
||||
'#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
|
||||
'#source/kernel/gen_system',
|
||||
'#source/kernel/gen_messaging',
|
||||
'#source/gameengine/Converter',
|
||||
'#source/gameengine/BlenderRoutines',
|
||||
'#source/blender/imbuf',
|
||||
'#source/gameengine/Ketsji',
|
||||
'#source/blender/blenlib',
|
||||
|
@ -29,10 +29,10 @@ set(INC
|
||||
../../../../intern/string
|
||||
../../../../intern/ghost
|
||||
../../../../intern/guardedalloc
|
||||
../../../../intern/container
|
||||
../../../../intern/moto/include
|
||||
../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
||||
../../../../source/kernel/gen_system
|
||||
../../../../source/kernel/gen_messaging
|
||||
../../../../source/gameengine/BlenderRoutines
|
||||
../../../../source/gameengine/Converter
|
||||
../../../../source/blender/imbuf
|
||||
../../../../source/gameengine/Ketsji
|
||||
|
@ -69,11 +69,11 @@ extern "C"
|
||||
**********************************/
|
||||
|
||||
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
#include "KX_KetsjiEngine.h"
|
||||
|
||||
// include files needed by "KX_BlenderSceneConverter.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "SCA_IActuator.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
#include "RAS_OpenGLRasterizer.h"
|
||||
|
@ -47,7 +47,6 @@
|
||||
//#include <Carbon/Carbon.h>
|
||||
//#include <CFBundle.h>
|
||||
#endif // __APPLE__
|
||||
#include "GEN_messaging.h"
|
||||
#include "KX_KetsjiEngine.h"
|
||||
#include "KX_PythonInit.h"
|
||||
|
||||
@ -92,7 +91,7 @@ extern char datatoc_bfont_ttf[];
|
||||
* End Blender include block
|
||||
**********************************/
|
||||
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
#include "GPG_Application.h"
|
||||
|
||||
#include "GHOST_ISystem.h"
|
||||
@ -403,8 +402,6 @@ int main(int argc, char** argv)
|
||||
|
||||
initglobals();
|
||||
|
||||
GEN_init_messaging_system();
|
||||
|
||||
IMB_init();
|
||||
|
||||
// Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c)
|
||||
|
@ -13,9 +13,9 @@ incs = ['.',
|
||||
'#intern/ghost',
|
||||
'#intern/guardedalloc',
|
||||
'#intern/moto/include',
|
||||
'#intern/container',
|
||||
'#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
|
||||
'#source/kernel/gen_system',
|
||||
'#source/kernel/gen_messaging',
|
||||
'#source/gameengine/BlenderRoutines',
|
||||
'#source/gameengine/Converter',
|
||||
'#source/blender/imbuf',
|
||||
'#source/gameengine/Ketsji',
|
||||
|
@ -26,11 +26,12 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/container
|
||||
../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
||||
../../../source/gameengine/Converter
|
||||
../../../source/gameengine/BlenderRoutines
|
||||
../../../source/blender/imbuf
|
||||
../../../intern/moto/include
|
||||
../../../source/gameengine/Ketsji
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../../source/kernel/gen_system
|
||||
../../../../intern/string
|
||||
../../../../intern/container
|
||||
../../../../intern/moto/include
|
||||
../../../../source/gameengine/Ketsji
|
||||
../../../../source/gameengine/GameLogic
|
||||
|
@ -3,7 +3,8 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.cpp')
|
||||
|
||||
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Ketsji'
|
||||
incs = '. #intern/string #intern/moto/include'
|
||||
incs += ' #source/gameengine/Ketsji #intern/container'
|
||||
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions'
|
||||
incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
|
||||
|
||||
|
@ -101,7 +101,7 @@ bool KX_CameraActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
}
|
||||
|
||||
|
||||
void KX_CameraActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_CameraActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_ob];
|
||||
if (h_obj) {
|
||||
|
@ -116,7 +116,7 @@ private :
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
|
||||
/** Methods inherited from SCA_ILogicBrick */
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
|
||||
#ifdef WITH_PYTHON
|
||||
|
||||
|
@ -42,13 +42,13 @@
|
||||
#include "BL_DeformableGameObject.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
#include "KX_Scene.h"
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
|
||||
#include "PHY_Pro.h" //todo cleanup
|
||||
#include "KX_ClientObjectInfo.h"
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
|
||||
#include "KX_PhysicsEngineEnums.h"
|
||||
#include "PHY_Pro.h"
|
||||
|
@ -1224,7 +1224,7 @@ CListValue* KX_GameObject::GetChildrenRecursive()
|
||||
/* ---------------------------------------------------------------------
|
||||
* Some stuff taken from the header
|
||||
* --------------------------------------------------------------------- */
|
||||
void KX_GameObject::Relink(GEN_Map<GEN_HashedPtr, void*> *map_parameter)
|
||||
void KX_GameObject::Relink(CTR_Map<CTR_HashedPtr, void*> *map_parameter)
|
||||
{
|
||||
// we will relink the sensors and actuators that use object references
|
||||
// if the object is part of the replicated hierarchy, use the new
|
||||
|
@ -47,8 +47,8 @@
|
||||
#include "SG_Node.h"
|
||||
#include "MT_Transform.h"
|
||||
#include "MT_CmMatrix4x4.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "KX_Scene.h"
|
||||
#include "KX_KetsjiEngine.h" /* for m_anim_framerate */
|
||||
#include "KX_IPhysicsController.h" /* for suspend/resume */
|
||||
@ -142,7 +142,7 @@ public:
|
||||
|
||||
virtual void /* This function should be virtual - derived classed override it */
|
||||
Relink(
|
||||
GEN_Map<GEN_HashedPtr, void*> *map
|
||||
CTR_Map<CTR_HashedPtr, void*> *map
|
||||
);
|
||||
|
||||
/**
|
||||
|
@ -299,7 +299,7 @@ bool KX_ObjectActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void KX_ObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_ObjectActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_reference];
|
||||
if (h_obj) {
|
||||
|
@ -144,7 +144,7 @@ public:
|
||||
CValue* GetReplica();
|
||||
void ProcessReplica();
|
||||
bool UnlinkObject(SCA_IObject* clientobj);
|
||||
void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
|
||||
void SetForceLoc(const double force[3]) { /*m_force=force;*/ }
|
||||
void UpdateFuzzyFlags()
|
||||
|
@ -99,7 +99,7 @@ bool KX_ParentActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void KX_ParentActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_ParentActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_ob];
|
||||
if (h_obj) {
|
||||
|
@ -76,7 +76,7 @@ class KX_ParentActuator : public SCA_IActuator
|
||||
|
||||
virtual CValue* GetReplica();
|
||||
virtual void ProcessReplica();
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
|
||||
#ifdef WITH_PYTHON
|
||||
|
@ -151,7 +151,7 @@ bool KX_SCA_AddObjectActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void KX_SCA_AddObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_SCA_AddObjectActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_OriginalObject];
|
||||
if (h_obj) {
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
UnlinkObject(SCA_IObject* clientobj);
|
||||
|
||||
virtual void
|
||||
Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
|
||||
virtual bool
|
||||
Update();
|
||||
|
@ -67,7 +67,7 @@
|
||||
#include "SCA_IController.h"
|
||||
#include "SCA_IActuator.h"
|
||||
#include "SG_Node.h"
|
||||
#include "SYS_System.h"
|
||||
#include "BL_System.h"
|
||||
#include "SG_Controller.h"
|
||||
#include "SG_IObject.h"
|
||||
#include "SG_Tree.h"
|
||||
|
@ -41,8 +41,8 @@
|
||||
#include <set>
|
||||
#include <list>
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "GEN_HashedPtr.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "CTR_HashedPtr.h"
|
||||
#include "SG_IObject.h"
|
||||
#include "SCA_IScene.h"
|
||||
#include "MT_Transform.h"
|
||||
@ -61,7 +61,7 @@ struct SM_MaterialProps;
|
||||
struct SM_ShapeProps;
|
||||
struct Scene;
|
||||
|
||||
class GEN_HashedPtr;
|
||||
class CTR_HashedPtr;
|
||||
class CListValue;
|
||||
class CValue;
|
||||
class SCA_LogicManager;
|
||||
@ -207,7 +207,7 @@ protected:
|
||||
* used in AddReplicaObject to map game objects to their
|
||||
* replicas so pointers can be updated.
|
||||
*/
|
||||
GEN_Map <GEN_HashedPtr, void*> m_map_gameobject_to_replica;
|
||||
CTR_Map <CTR_HashedPtr, void*> m_map_gameobject_to_replica;
|
||||
|
||||
/**
|
||||
* Another temporary variable outstaying its welcome
|
||||
|
@ -97,7 +97,7 @@ bool KX_SceneActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void KX_SceneActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_SceneActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_camera];
|
||||
if (h_obj) {
|
||||
|
@ -85,7 +85,7 @@ class KX_SceneActuator : public SCA_IActuator
|
||||
virtual CValue* GetReplica();
|
||||
virtual void ProcessReplica();
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
|
||||
virtual bool Update();
|
||||
|
||||
|
@ -219,7 +219,7 @@ bool KX_TrackToActuator::UnlinkObject(SCA_IObject* clientobj)
|
||||
return false;
|
||||
}
|
||||
|
||||
void KX_TrackToActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
|
||||
void KX_TrackToActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
|
||||
{
|
||||
void **h_obj = (*obj_map)[m_object];
|
||||
if (h_obj) {
|
||||
|
@ -67,7 +67,7 @@ class KX_TrackToActuator : public SCA_IActuator
|
||||
|
||||
virtual void ProcessReplica();
|
||||
virtual bool UnlinkObject(SCA_IObject* clientobj);
|
||||
virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
|
||||
virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map);
|
||||
virtual bool Update(double curtime, bool frame);
|
||||
|
||||
#ifdef WITH_PYTHON
|
||||
|
@ -8,7 +8,7 @@ defs = [ 'GLEW_STATIC' ]
|
||||
|
||||
incs = '. #source/blender/python/generic' # Only for Mathutils! and bpy_internal_import.h, be very careful
|
||||
|
||||
incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc'
|
||||
incs += ' #intern/string #intern/guardedalloc #intern/container'
|
||||
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
|
||||
incs += ' #intern/audaspace/intern #source/gameengine/Converter'
|
||||
incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include'
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../intern/string
|
||||
../../../intern/container
|
||||
../../../intern/moto/include
|
||||
)
|
||||
|
||||
|
@ -26,8 +26,8 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../../source/kernel/gen_system
|
||||
../../../../intern/string
|
||||
../../../../intern/container
|
||||
../../../../source/gameengine/Network
|
||||
)
|
||||
|
||||
|
@ -3,6 +3,6 @@ Import ('env')
|
||||
|
||||
sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
|
||||
|
||||
incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
|
||||
incs = '. #intern/string #intern/container #source/gameengine/Network'
|
||||
|
||||
env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
|
||||
|
@ -34,7 +34,7 @@
|
||||
#ifndef __NG_NETWORKSCENE_H
|
||||
#define __NG_NETWORKSCENE_H
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include <vector>
|
||||
|
||||
@ -52,10 +52,10 @@ class NG_NetworkDeviceInterface;
|
||||
class NG_NetworkScene
|
||||
{
|
||||
class NG_NetworkDeviceInterface *m_networkdevice;
|
||||
GEN_Map<STR_HashedString, class NG_NetworkObject *> m_networkObjects;
|
||||
CTR_Map<STR_HashedString, class NG_NetworkObject *> m_networkObjects;
|
||||
|
||||
// GEN_Maps used as a 'Bloom' filter
|
||||
typedef GEN_Map<STR_HashedString, std::vector<class NG_NetworkMessage*>* > TMessageMap;
|
||||
// CTR_Maps used as a 'Bloom' filter
|
||||
typedef CTR_Map<STR_HashedString, std::vector<class NG_NetworkMessage*>* > TMessageMap;
|
||||
TMessageMap m_messagesByDestinationName;
|
||||
TMessageMap m_messagesBySenderName;
|
||||
TMessageMap m_messagesBySubject;
|
||||
|
@ -3,7 +3,7 @@ Import ('env')
|
||||
|
||||
sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp'
|
||||
|
||||
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
|
||||
incs = '. #intern/string #intern/moto/include #intern/container'
|
||||
|
||||
defs = []
|
||||
|
||||
|
@ -33,7 +33,7 @@ set(INC
|
||||
../../../../extern/bullet2/src
|
||||
../../../../intern/moto/include
|
||||
../../../../intern/guardedalloc
|
||||
../../../kernel/gen_system
|
||||
../../../../intern/container
|
||||
../../../../intern/string
|
||||
../../Rasterizer
|
||||
../../Ketsji
|
||||
|
@ -4,7 +4,6 @@ Import ('env')
|
||||
sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp'
|
||||
|
||||
incs = '. ../common'
|
||||
incs += ' #source/kernel/gen_system'
|
||||
incs += ' #intern/string'
|
||||
incs += ' #intern/moto/include'
|
||||
incs += ' #extern/glew/include'
|
||||
@ -17,6 +16,7 @@ incs += ' #source/blender/makesdna'
|
||||
incs += ' #source/blender/blenkernel'
|
||||
incs += ' #source/blender/blenlib'
|
||||
incs += ' #intern/guardedalloc'
|
||||
incs += ' #intern/container'
|
||||
|
||||
incs += ' ' + env['BF_BULLET_INC']
|
||||
|
||||
|
@ -26,11 +26,11 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../../source/kernel/gen_system
|
||||
../../../source/blender/makesdna
|
||||
../../../source/gameengine/SceneGraph
|
||||
../../../source/gameengine/Ketsji
|
||||
../../../intern/string
|
||||
../../../intern/container
|
||||
../../../intern/moto/include
|
||||
../../../intern/guardedalloc
|
||||
../Expressions
|
||||
|
@ -36,7 +36,7 @@
|
||||
#pragma warning (disable:4786)
|
||||
#endif
|
||||
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
#include "RAS_MaterialBucket.h"
|
||||
#include "STR_HashedString.h"
|
||||
#include "RAS_MeshObject.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
#include "MT_Transform.h"
|
||||
#include "RAS_MaterialBucket.h"
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -39,7 +39,7 @@
|
||||
#endif //WIN32
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "GEN_Map.h"
|
||||
#include "CTR_Map.h"
|
||||
|
||||
#ifdef WITH_CXX_GUARDEDALLOC
|
||||
#include "MEM_guardedalloc.h"
|
||||
@ -53,7 +53,7 @@ class RAS_Deformer
|
||||
public:
|
||||
RAS_Deformer() : m_pMesh(NULL), m_bDynamic(false) {};
|
||||
virtual ~RAS_Deformer(){};
|
||||
virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)=0;
|
||||
virtual void Relink(CTR_Map<class CTR_HashedPtr, void*>*map)=0;
|
||||
virtual bool Apply(class RAS_IPolyMaterial *polymat)=0;
|
||||
virtual bool Update(void)=0;
|
||||
virtual bool UpdateBuckets(void)=0;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user