Revision: 16364
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16364
Author: blendix
Date: 2008-09-04 17:45:25 +0200 (Thu, 04 Sep 2008)
Log Message:
-----------
Apricot Branch
==============
Various changes from trunk that were somehow missed with merges, and
small code cleanups and fixes.
Modified Paths:
--------------
branches/apricot/CMakeLists.txt
branches/apricot/config/darwin-config.py
branches/apricot/config/win32-vc-config.py
branches/apricot/extern/x264/SConscript
branches/apricot/intern/guardedalloc/MEM_guardedalloc.h
branches/apricot/intern/memutil/MEM_Allocator.h
branches/apricot/intern/memutil/MEM_CacheLimiter.h
branches/apricot/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/apricot/release/scripts/bpymodules/colladaImEx/collada.py
branches/apricot/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/apricot/release/scripts/bpymodules/colladaImEx/translator.py
branches/apricot/source/blender/blenkernel/intern/armature.c
branches/apricot/source/blender/blenkernel/intern/blender.c
branches/apricot/source/blender/blenkernel/intern/cdderivedmesh.c
branches/apricot/source/blender/blenlib/BLI_arithb.h
branches/apricot/source/blender/blenlib/intern/arithb.c
branches/apricot/source/blender/imbuf/intern/util.c
branches/apricot/source/blender/include/BDR_editface.h
branches/apricot/source/blender/include/BIF_editparticle.h
branches/apricot/source/blender/include/BIF_meshtools.h
branches/apricot/source/blender/include/BSE_view.h
branches/apricot/source/blender/makesdna/DNA_customdata_types.h
branches/apricot/source/blender/makesdna/DNA_material_types.h
branches/apricot/source/blender/makesdna/DNA_object_types.h
branches/apricot/source/blender/makesdna/DNA_texture_types.h
branches/apricot/source/blender/python/BPY_interface.c
branches/apricot/source/blender/python/api2_2x/Node.c
branches/apricot/source/blender/src/drawimage.c
branches/apricot/source/blender/src/editmesh_mods.c
branches/apricot/source/blender/src/editmesh_tools.c
branches/apricot/source/blender/src/editmode_undo.c
branches/apricot/source/blender/src/header_info.c
branches/apricot/source/blender/src/header_view3d.c
branches/apricot/source/blender/src/renderwin.c
branches/apricot/source/blender/src/retopo.c
branches/apricot/source/blender/src/sequence.c
branches/apricot/source/blender/yafray/intern/export_File.cpp
branches/apricot/source/blender/yafray/intern/export_Plugin.cpp
branches/apricot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/apricot/source/gameengine/BlenderRoutines/Makefile
branches/apricot/source/gameengine/BlenderRoutines/SConscript
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeDeformer.h
branches/apricot/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/apricot/source/gameengine/GamePlayer/common/Makefile
branches/apricot/source/gameengine/GamePlayer/ghost/Makefile
branches/apricot/source/gameengine/GamePlayer/ghost/SConscript
branches/apricot/source/gameengine/Ketsji/Makefile
branches/apricot/source/gameengine/Ketsji/SConscript
branches/apricot/source/gameengine/PyDoc/GameLogic.py
branches/apricot/source/gameengine/Rasterizer/Makefile
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/apricot/source/gameengine/Rasterizer/SConscript
branches/apricot/source/nan_definitions.mk
branches/apricot/tools/btools.py
Modified: branches/apricot/CMakeLists.txt
===================================================================
--- branches/apricot/CMakeLists.txt 2008-09-04 15:29:43 UTC (rev 16363)
+++ branches/apricot/CMakeLists.txt 2008-09-04 15:45:25 UTC (rev 16364)
@@ -287,7 +287,7 @@
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
+ SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(CMAKE_CL_64)
@@ -337,7 +337,7 @@
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/NODEFAULTLIB:libcmt.lib ")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
IF(APPLE)
Modified: branches/apricot/config/darwin-config.py
===================================================================
--- branches/apricot/config/darwin-config.py 2008-09-04 15:29:43 UTC (rev
16363)
+++ branches/apricot/config/darwin-config.py 2008-09-04 15:45:25 UTC (rev
16364)
@@ -143,7 +143,6 @@
WITH_BF_GAMEENGINE='true'
WITH_BF_PLAYER='true'
-WITH_BF_GLEXT= '1'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
Modified: branches/apricot/config/win32-vc-config.py
===================================================================
--- branches/apricot/config/win32-vc-config.py 2008-09-04 15:29:43 UTC (rev
16363)
+++ branches/apricot/config/win32-vc-config.py 2008-09-04 15:45:25 UTC (rev
16364)
@@ -170,7 +170,6 @@
/NODEFAULTLIB:"libcd.lib"
/NODEFAULTLIB:"libcpd.lib"
/NODEFAULTLIB:"libcp.lib"
- /NODEFAULTLIB:"libcmtd.lib"
'''
BF_BUILDDIR = '..\\build\\win32-vc'
Modified: branches/apricot/extern/x264/SConscript
===================================================================
--- branches/apricot/extern/x264/SConscript 2008-09-04 15:29:43 UTC (rev
16363)
+++ branches/apricot/extern/x264/SConscript 2008-09-04 15:45:25 UTC (rev
16364)
@@ -117,6 +117,9 @@
if "CFLAGS" in vars:
cflags += " " + vars["CFLAGS"]
+if "ALTIVECFLAGS" in vars:
+ cflags += " " + vars["ALTIVECFLAGS"]
+
asflags = ""
for a in vars['ASFLAGS'].split():
Modified: branches/apricot/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/apricot/intern/guardedalloc/MEM_guardedalloc.h 2008-09-04
15:29:43 UTC (rev 16363)
+++ branches/apricot/intern/guardedalloc/MEM_guardedalloc.h 2008-09-04
15:45:25 UTC (rev 16364)
@@ -59,7 +59,7 @@
#define MEM_MALLOCN_H
#include "stdio.h" /* needed for FILE* */
-#include "BLO_sys_types.h" /* needed for intptr_t */
+#include "BLO_sys_types.h" /* needed for uintptr_t */
#ifdef __cplusplus
extern "C" {
Modified: branches/apricot/intern/memutil/MEM_Allocator.h
===================================================================
--- branches/apricot/intern/memutil/MEM_Allocator.h 2008-09-04 15:29:43 UTC
(rev 16363)
+++ branches/apricot/intern/memutil/MEM_Allocator.h 2008-09-04 15:45:25 UTC
(rev 16364)
@@ -25,6 +25,7 @@
#define __MEM_Allocator_h_included__ 1
#include "guardedalloc/MEM_guardedalloc.h"
+#include "guardedalloc/BLO_sys_types.h"
#ifdef _MSC_VER
#if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost
Modified: branches/apricot/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- branches/apricot/intern/memutil/MEM_CacheLimiter.h 2008-09-04 15:29:43 UTC
(rev 16363)
+++ branches/apricot/intern/memutil/MEM_CacheLimiter.h 2008-09-04 15:45:25 UTC
(rev 16364)
@@ -61,8 +61,8 @@
#ifndef __MEM_cache_limiter_c_api_h_included__
extern "C" {
- extern void MEM_CacheLimiter_set_maximum(unsigned long m);
- extern unsigned long MEM_CacheLimiter_get_maximum();
+ extern void MEM_CacheLimiter_set_maximum(intptr_t m);
+ extern intptr_t MEM_CacheLimiter_get_maximum();
};
#endif
@@ -138,9 +138,9 @@
delete handle;
}
void enforce_limits() {
- unsigned long max = MEM_CacheLimiter_get_maximum();
- unsigned long mem_in_use= MEM_get_memory_in_use();
- unsigned long mmap_in_use= MEM_get_mapped_memory_in_use();
+ intptr_t max = MEM_CacheLimiter_get_maximum();
+ intptr_t mem_in_use= MEM_get_memory_in_use();
+ intptr_t mmap_in_use= MEM_get_mapped_memory_in_use();
if (max == 0) {
return;
Modified: branches/apricot/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
===================================================================
--- branches/apricot/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
2008-09-04 15:29:43 UTC (rev 16363)
+++ branches/apricot/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
2008-09-04 15:45:25 UTC (rev 16364)
@@ -27,18 +27,18 @@
#include "MEM_CacheLimiter.h"
#include "MEM_CacheLimiterC-Api.h"
-static unsigned long & get_max()
+static intptr_t & get_max()
{
- static unsigned long m = 32*1024*1024;
+ static intptr_t m = 32*1024*1024;
return m;
}
-void MEM_CacheLimiter_set_maximum(unsigned long m)
+void MEM_CacheLimiter_set_maximum(intptr_t m)
{
get_max() = m;
}
-unsigned long MEM_CacheLimiter_get_maximum()
+intptr_t MEM_CacheLimiter_get_maximum()
{
return get_max();
}
Modified: branches/apricot/release/scripts/bpymodules/colladaImEx/collada.py
===================================================================
--- branches/apricot/release/scripts/bpymodules/colladaImEx/collada.py
2008-09-04 15:29:43 UTC (rev 16363)
+++ branches/apricot/release/scripts/bpymodules/colladaImEx/collada.py
2008-09-04 15:45:25 UTC (rev 16364)
@@ -28,6 +28,8 @@
from cutils import *
from datetime import *
+debprn = 0 #False #--- print debug "print 'deb: ..."
+
# The number of decimals to export floats to
ROUND = 5
@@ -483,11 +485,11 @@
self.target = xmlUtils.ReadAttribute(xmlNode, DaeSyntax.TARGET)
def SaveToXml(self, daeDocument):
-# if debprn: print 'deb:DaeChannel() self.source=', self.source
#-------
-# if debprn: print 'deb:DaeChannel() self.target=', self.target
#-------
+ if debprn: print 'deb:DaeChannel() self.source=', self.source
#-------
+ if debprn: print 'deb:DaeChannel() self.target=', self.target
#-------
node = super(DaeChannel, self).SaveToXml(daeDocument)
-#org SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source.id))
- SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source))
+ SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source.id))
+ ##SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source))
SetAttribute(node, DaeSyntax.TARGET, self.target)
return node
Modified:
branches/apricot/release/scripts/bpymodules/colladaImEx/helperObjects.py
===================================================================
--- branches/apricot/release/scripts/bpymodules/colladaImEx/helperObjects.py
2008-09-04 15:29:43 UTC (rev 16363)
+++ branches/apricot/release/scripts/bpymodules/colladaImEx/helperObjects.py
2008-09-04 15:45:25 UTC (rev 16364)
@@ -26,7 +26,7 @@
import collada
from Blender.Mathutils import *
-debprn = False #--- print debug "print 'deb: ..."
+debprn = 0 #False #--- print debug "print 'deb: ..."
class Armature(object):
# static vars
@@ -219,6 +219,9 @@
types.append(Blender.Object.Pose.LOC)
elif ta[0] == collada.DaeSyntax.ROTATE and not
Blender.Object.Pose.ROT in types:
types.append(Blender.Object.Pose.ROT)
+ #TODO: check if scale correct implemented
+ elif ta[0] == collada.DaeSyntax.SCALE and not
Blender.Object.Pose.SCALE in types:
+ types.append(Blender.Object.Pose.SCALE)
return types
def GetType(self, daeNode, target):
@@ -237,11 +240,16 @@
targetId = targetArray[1]
# Get the animationInfo object for this node
(or create a new one)
animation = cls._animations.setdefault(nodeId,
AnimationInfo(nodeId))
+ #if debprn: print 'deb:helperObj.py:class
AnimationInfo CreateAnimations() dir(animation)', dir(animation) #----------
# loop trough all samplers
sampler = None
+ if debprn: print 'deb:helperObj.py:class
AnimationInfo CreateAnimations() \ndeb: channel.source= ', channel.source
#----------
for s in daeAnimation.samplers:
- if s.id == channel.source[1:]:
+ #if debprn: print 'deb: sampler.id
= ', s.id #----------
+ #if debprn: print 'deb:
channel.source[1:]= ', channel.source[1:] #----------
+#org if s.id == channel.source[1:]:
+ if s.id == channel.source:
sampler = s
# Get the values for all the inputs
@@ -249,18 +257,41 @@
input = sampler.GetInput("INPUT")
inputSource =
daeAnimation.GetSource(input.source)
if
inputSource.techniqueCommon.accessor.HasParam("TIME") and
len(inputSource.techniqueCommon.accessor.params) == 1:
+ if debprn: print 'deb: DDDDD
getting target' #----------
output =
sampler.GetInput("OUTPUT")
outputSource =
daeAnimation.GetSource(output.source)
outputAccessor =
outputSource.techniqueCommon.accessor
accessorCount =
outputAccessor.count
accessorStride =
outputAccessor.stride
+ interpolations =
sampler.GetInput("INTERPOLATION")
+ interpolationsSource =
daeAnimation.GetSource(interpolations.source)
+ if 0: #because probably
interpolationsAccessor is identical to outputAccessor
+ interpolationsAccessor
= interpolationsSource.techniqueCommon.accessor
+ accessorCount =
interpolationsAccessor.count
+ accessorStride =
interpolationsAccessor.stride
+
+ if debprn: print 'deb:
outputSource.source.data: ', outputSource.source.data #----------
+ #if debprn: print 'deb:
dir(outputAccessor.params): ', dir(outputAccessor.params) #----------
+ #if debprn: print 'deb:
dir(outputAccessor.params[0]): ', str(outputAccessor.params[0]) #----------
times = [x*fps for x in
inputSource.source.data]
-
+ if debprn: print 'deb: times=',
times #---------
for timeIndex in
range(len(times)):
time =
animation.times.setdefault(times[timeIndex], dict())
target =
time.setdefault(targetId, dict())
+ #interp =
time.setdefault(targetId, dict())
+ #if debprn: print 'deb:
accessorStride=', accessorStride #---------
+ value = []
for j in
range(accessorStride):
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
