Revision: 15594
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15594
Author: jaguarandi
Date: 2008-07-15 23:08:39 +0200 (Tue, 15 Jul 2008)
Log Message:
-----------
Last commit fixed the file contents.. but some svn props were missing.
So I fixed the problem with merges instead of copying files over.
Also trunk/blender/release/scripts/scripttemplate_ipo_gen.py from revision
14530 was missing. (that was fixed)
svn merge -r 15590:15551
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (revert
changes to the point where the merge was incorrect)
svn merge -r 15552:15572
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (apply
branch modifications)
svn merge -r 15392:15590
https://svn.blender.org/svnroot/bf-blender/trunk/blender (merge from trunk)
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14530
Modified Paths:
--------------
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/Makefile
Added Paths:
-----------
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-jaguarandi/source/blender/render/intern/include/sunsky.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/sunsky.c
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.h
Removed Paths:
-------------
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-jaguarandi/source/blender/render/intern/include/sunsky.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/sunsky.c
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.h
Deleted: branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
2008-07-15 21:07:13 UTC (rev 15593)
+++ branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
2008-07-15 21:08:39 UTC (rev 15594)
@@ -1,92 +0,0 @@
-#!BPY
-"""
-Name: 'Camera/Object Example'
-Blender: 245
-Group: 'ScriptTemplate'
-Tooltip: 'Script template for setting the camera direction'
-"""
-
-from Blender import Window
-import bpy
-
-script_data = \
-'''#!BPY
-"""
-Name: 'My Ipo Script'
-Blender: 245
-Group: 'Animation'
-Tooltip: 'Put some useful info here'
-"""
-
-# Add a licence here if you wish to re-distribute, we recommend the GPL
-
-from Blender import Ipo, Mathutils, Window
-import bpy, BPyMessages
-
-def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep):
- # Create an new Ipo Curve of name myIpo and type Object
- myIpo = bpy.data.ipos.new('myIpo', 'Object')
-
- # Create LocX, LocY, and LocZ Ipo curves in our new Curve Object
- # and store them so we can access them later
- myIpo_x = myIpo.addCurve('LocX')
- myIpo_y = myIpo.addCurve('LocY')
- myIpo_z = myIpo.addCurve('LocZ')
-
- # What value we want to scale our random value by
- ipoScale = 4
-
- # This Calculates the End Frame for use in an xrange() expression
- endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep
-
- for frame in xrange(firstFrame, endFrame, frameStep):
-
- # Use the Mathutils Rand() function to get random numbers
- ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale
- ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale
- ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale
-
- # Append to the Ipo curve at location frame, with the value
ipoValue_x
- # Note that we should pass the append function a tuple or a
BezTriple
- myIpo_x.append((frame, ipoValue_x))
-
- # Similar to above
- myIpo_y.append((frame, ipoValue_y))
- myIpo_z.append((frame, ipoValue_z))
-
- # Link our new Ipo Curve to the passed object
- object.setIpo(myIpo)
- print object
-
-
-def main():
-
- # Get the active scene, since there can be multiple ones
- sce = bpy.data.scenes.active
-
- # Get the active object
- object = sce.objects.active
-
- # If there is no active object, pop up an error message
- if not object:
- BPyMessages.Error_NoActive()
-
- Window.WaitCursor(1)
-
- # Call our makeRandomIpo function
- # Pass it our object, Tell it to keys from the start frame until the
end frame, at a step of 10 frames
- # between them
-
- makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10)
-
- Window.WaitCursor(0)
-
-if __name__ == '__main__':
- main()
-
-'''
-
-new_text = bpy.data.texts.new('ipo_template.py')
-new_text.write(script_data)
-bpy.data.texts.active = new_text
-Window.RedrawAll()
Copied: branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
(from rev 15592, trunk/blender/release/scripts/scripttemplate_ipo_gen.py)
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
(rev 0)
+++ branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
2008-07-15 21:08:39 UTC (rev 15594)
@@ -0,0 +1,92 @@
+#!BPY
+"""
+Name: 'Camera/Object Example'
+Blender: 245
+Group: 'ScriptTemplate'
+Tooltip: 'Script template for setting the camera direction'
+"""
+
+from Blender import Window
+import bpy
+
+script_data = \
+'''#!BPY
+"""
+Name: 'My Ipo Script'
+Blender: 245
+Group: 'Animation'
+Tooltip: 'Put some useful info here'
+"""
+
+# Add a licence here if you wish to re-distribute, we recommend the GPL
+
+from Blender import Ipo, Mathutils, Window
+import bpy, BPyMessages
+
+def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep):
+ # Create an new Ipo Curve of name myIpo and type Object
+ myIpo = bpy.data.ipos.new('myIpo', 'Object')
+
+ # Create LocX, LocY, and LocZ Ipo curves in our new Curve Object
+ # and store them so we can access them later
+ myIpo_x = myIpo.addCurve('LocX')
+ myIpo_y = myIpo.addCurve('LocY')
+ myIpo_z = myIpo.addCurve('LocZ')
+
+ # What value we want to scale our random value by
+ ipoScale = 4
+
+ # This Calculates the End Frame for use in an xrange() expression
+ endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep
+
+ for frame in xrange(firstFrame, endFrame, frameStep):
+
+ # Use the Mathutils Rand() function to get random numbers
+ ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale
+ ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale
+ ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale
+
+ # Append to the Ipo curve at location frame, with the value
ipoValue_x
+ # Note that we should pass the append function a tuple or a
BezTriple
+ myIpo_x.append((frame, ipoValue_x))
+
+ # Similar to above
+ myIpo_y.append((frame, ipoValue_y))
+ myIpo_z.append((frame, ipoValue_z))
+
+ # Link our new Ipo Curve to the passed object
+ object.setIpo(myIpo)
+ print object
+
+
+def main():
+
+ # Get the active scene, since there can be multiple ones
+ sce = bpy.data.scenes.active
+
+ # Get the active object
+ object = sce.objects.active
+
+ # If there is no active object, pop up an error message
+ if not object:
+ BPyMessages.Error_NoActive()
+
+ Window.WaitCursor(1)
+
+ # Call our makeRandomIpo function
+ # Pass it our object, Tell it to keys from the start frame until the
end frame, at a step of 10 frames
+ # between them
+
+ makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10)
+
+ Window.WaitCursor(0)
+
+if __name__ == '__main__':
+ main()
+
+'''
+
+new_text = bpy.data.texts.new('ipo_template.py')
+new_text.write(script_data)
+bpy.data.texts.active = new_text
+Window.RedrawAll()
Deleted: branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
2008-07-15 21:07:13 UTC (rev 15593)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
2008-07-15 21:08:39 UTC (rev 15594)
@@ -1,44 +0,0 @@
-/**
- * Simple fast memory allocator
- *
- *
- * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Geoffrey Bantle.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BLI_MEMPOOL_H
-#define BLI_MEMPOOL_H
-
-struct BLI_mempool;
-typedef struct BLI_mempool BLI_mempool;
-
-BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk);
-void *BLI_mempool_alloc(BLI_mempool *pool);
-void *BLI_mempool_calloc(BLI_mempool *pool);
-void BLI_mempool_free(BLI_mempool *pool, void *addr);
-void BLI_mempool_destroy(BLI_mempool *pool);
-
-
-#endif
Copied: branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h (from
rev 15590, trunk/blender/source/blender/blenlib/BLI_mempool.h)
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
(rev 0)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
2008-07-15 21:08:39 UTC (rev 15594)
@@ -0,0 +1,44 @@
+/**
+ * Simple fast memory allocator
+ *
+ *
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Geoffrey Bantle.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BLI_MEMPOOL_H
+#define BLI_MEMPOOL_H
+
+struct BLI_mempool;
+typedef struct BLI_mempool BLI_mempool;
+
+BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk);
+void *BLI_mempool_alloc(BLI_mempool *pool);
+void *BLI_mempool_calloc(BLI_mempool *pool);
+void BLI_mempool_free(BLI_mempool *pool, void *addr);
+void BLI_mempool_destroy(BLI_mempool *pool);
+
+
+#endif
Deleted:
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
2008-07-15 21:07:13 UTC (rev 15593)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
2008-07-15 21:08:39 UTC (rev 15594)
@@ -1,140 +0,0 @@
-/**
- *
- * ***** 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
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
