[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20398] branches/soc-2009-chingachgook: Created blender/source/collada skeleton for new 'bf_collada' lib

[Arystanbek Dyussenov]

Revision: 20398
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20398
Author:   kazanbas
Date:     2009-05-25 10:46:24 +0200 (Mon, 25 May 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    branches/soc-2009-chingachgook/config/linux2-config.py
    branches/soc-2009-chingachgook/source/blender/SConscript
    branches/soc-2009-chingachgook/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-chingachgook/source/blender/collada/
    branches/soc-2009-chingachgook/source/blender/collada/SConscript
    branches/soc-2009-chingachgook/source/blender/collada/collada.cpp
    branches/soc-2009-chingachgook/source/blender/collada/collada.h

Modified: branches/soc-2009-chingachgook/config/linux2-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/linux2-config.py	2009-05-25 06:24:23 UTC (rev 20397)
+++ branches/soc-2009-chingachgook/config/linux2-config.py	2009-05-25 08:46:24 UTC (rev 20398)
@@ -160,6 +160,11 @@
 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++'

Modified: branches/soc-2009-chingachgook/source/blender/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/SConscript	2009-05-25 06:24:23 UTC (rev 20397)
+++ branches/soc-2009-chingachgook/source/blender/SConscript	2009-05-25 08:46:24 UTC (rev 20398)
@@ -36,3 +36,6 @@
 
 if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_COLLADA']:
+    SConscript (['collada/SConscript'])

Added: branches/soc-2009-chingachgook/source/blender/collada/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/SConscript	                        (rev 0)
+++ branches/soc-2009-chingachgook/source/blender/collada/SConscript	2009-05-25 08:46:24 UTC (rev 20398)
@@ -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 )
+

Added: branches/soc-2009-chingachgook/source/blender/collada/collada.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/collada.cpp	                        (rev 0)
+++ branches/soc-2009-chingachgook/source/blender/collada/collada.cpp	2009-05-25 08:46:24 UTC (rev 20398)
@@ -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;
+}

Added: branches/soc-2009-chingachgook/source/blender/collada/collada.h
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/collada.h	                        (rev 0)
+++ branches/soc-2009-chingachgook/source/blender/collada/collada.h	2009-05-25 08:46:24 UTC (rev 20398)
@@ -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

Modified: branches/soc-2009-chingachgook/tools/btools.py
===================================================================
--- branches/soc-2009-chingachgook/tools/btools.py	2009-05-25 06:24:23 UTC (rev 20397)
+++ branches/soc-2009-chingachgook/tools/btools.py	2009-05-25 08:46:24 UTC (rev 20398)
@@ -49,6 +49,7 @@
 			'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 @@
 		('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)),