From 70066705a970f6a2d5ea55574c303325cd15dd52 Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Mon, 25 May 2009 08:46:24 +0000 Subject: [PATCH] Created blender/source/collada skeleton for new 'bf_collada' lib - setup SConscript, not sure about these values: libtype='core', priority=150 - only scons build on linux is set up - not configured to link to OpenCollada yet --- config/linux2-config.py | 5 +++++ source/blender/SConscript | 3 +++ source/blender/collada/SConscript | 10 ++++++++++ source/blender/collada/collada.cpp | 11 +++++++++++ source/blender/collada/collada.h | 18 ++++++++++++++++++ tools/btools.py | 6 ++++++ 6 files changed, 53 insertions(+) create mode 100644 source/blender/collada/SConscript create mode 100644 source/blender/collada/collada.cpp create mode 100644 source/blender/collada/collada.h diff --git a/config/linux2-config.py b/config/linux2-config.py index eb93d8084f1..98b7394e401 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -160,6 +160,11 @@ BF_OPENGL_LIB = 'GL GLU X11 Xi' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' +WITH_BF_COLLADA = True +BF_COLLADA = '#source/blender/collada' +BF_COLLADA_INC = '${BF_COLLADA}' +BF_COLLADA_LIB = 'bf_collada' + ## CC = 'gcc' CXX = 'g++' diff --git a/source/blender/SConscript b/source/blender/SConscript index f8b7fd358fe..4598e4e4979 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -36,3 +36,6 @@ if env['WITH_BF_OPENEXR']: if env['WITH_BF_QUICKTIME']: SConscript (['quicktime/SConscript']) + +if env['WITH_BF_COLLADA']: + SConscript (['collada/SConscript']) diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript new file mode 100644 index 00000000000..93e0c549b8c --- /dev/null +++ b/source/blender/collada/SConscript @@ -0,0 +1,10 @@ +#!/usr/bin/python +Import ('env') + +sources = env.Glob('*.cpp') + +# relative paths to include dirs, space-separated, string +incs = '../blenlib ../blenkernel' + +env.BlenderLib ('bf_collada', sources, Split(incs), [], libtype='core', priority=150 ) + diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp new file mode 100644 index 00000000000..7bb36ca0ee0 --- /dev/null +++ b/source/blender/collada/collada.cpp @@ -0,0 +1,11 @@ +#include "BKE_scene.h" + +int collada_import(Scene *sce, const char *filepath) +{ + return 1; +} + +int collada_export(Scene *sce, const char *filepath) +{ + return 1; +} diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h new file mode 100644 index 00000000000..bf4b21e896c --- /dev/null +++ b/source/blender/collada/collada.h @@ -0,0 +1,18 @@ +#ifndef BLENDER_COLLADA_H +#define BLENDER_COLLADA_H + +#include "BKE_scene.h" + +#ifdef __cplusplus +extern "C" { +#endif + /* + * both return 1 on success, 0 on error + */ + int collada_import(Scene *sce, const char *filepath); + int collada_export(Scene *sce, const char *filepath); +#ifdef __cplusplus +} +#endif + +#endif diff --git a/tools/btools.py b/tools/btools.py index bd646a2f3eb..24898841a96 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -49,6 +49,7 @@ def validate_arguments(args, bc): 'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', + 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'WITH_BF_PLAYER', 'WITH_BF_NOBLENDER', 'WITH_BF_BINRELOC', @@ -307,6 +308,11 @@ def read_opts(cfg, args): ('BF_OPENGL_LIBPATH', 'OpenGL library path', ''), ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), + + (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', True)), + ('BF_COLLADA', 'COLLADA base path', ''), + ('BF_COLLADA_INC', 'COLLADA include path', ''), + ('BF_COLLADA_LIB', 'COLLADA library', ''), (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)), (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),