[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11319] branches/soc-2007-red_fox: Merge 11262:11315 from /trunk/blender
Levi Schooley
redfox at hhofministries.org
Thu Jul 19 21:36:00 CEST 2007
Revision: 11319
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11319
Author: red_fox
Date: 2007-07-19 21:36:00 +0200 (Thu, 19 Jul 2007)
Log Message:
-----------
Merge 11262:11315 from /trunk/blender
Just my weekly sync with /trunk/blender.
Levi
Modified Paths:
--------------
branches/soc-2007-red_fox/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/soc-2007-red_fox/extern/bullet2/src/SConscript
branches/soc-2007-red_fox/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_action.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_object.h
branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/action.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/anim.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/armature.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/object.c
branches/soc-2007-red_fox/source/blender/blenlib/BLI_arithb.h
branches/soc-2007-red_fox/source/blender/blenlib/intern/arithb.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/readfile.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/writefile.c
branches/soc-2007-red_fox/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_curve_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_group_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_image_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_nla_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_world_types.h
branches/soc-2007-red_fox/source/blender/python/BPY_extern.h
branches/soc-2007-red_fox/source/blender/python/BPY_interface.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Constraint.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Curve.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Constraint.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2007-red_fox/source/blender/src/buttons_editing.c
branches/soc-2007-red_fox/source/blender/src/buttons_object.c
branches/soc-2007-red_fox/source/blender/src/drawobject.c
branches/soc-2007-red_fox/source/blender/src/drawview.c
branches/soc-2007-red_fox/source/blender/src/editconstraint.c
branches/soc-2007-red_fox/source/blender/src/editkey.c
branches/soc-2007-red_fox/source/blender/src/editobject.c
branches/soc-2007-red_fox/source/blender/src/header_view3d.c
branches/soc-2007-red_fox/source/blender/src/transform_conversions.c
branches/soc-2007-red_fox/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2007-red_fox/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2007-red_fox/source/gameengine/Physics/common/PHY_DynamicTypes.h
Modified: branches/soc-2007-red_fox/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/soc-2007-red_fox/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj 2007-07-19 19:36:00 UTC (rev 11319)
@@ -347,6 +347,12 @@
Name="ConstraintSolver"
Filter="">
<File
+ RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
+ </File>
+ <File
+ RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h">
+ </File>
+ <File
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h">
</File>
<File
Modified: branches/soc-2007-red_fox/extern/bullet2/src/SConscript
===================================================================
--- branches/soc-2007-red_fox/extern/bullet2/src/SConscript 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/extern/bullet2/src/SConscript 2007-07-19 19:36:00 UTC (rev 11319)
@@ -29,6 +29,7 @@
"BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
"BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
"BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
"BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
"BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
"BulletDynamics/Dynamics/btRigidBody.cpp",
Modified: branches/soc-2007-red_fox/projectfiles_vc7/blender/nodes/nodes.vcproj
===================================================================
--- branches/soc-2007-red_fox/projectfiles_vc7/blender/nodes/nodes.vcproj 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/projectfiles_vc7/blender/nodes/nodes.vcproj 2007-07-19 19:36:00 UTC (rev 11319)
@@ -294,6 +294,9 @@
RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_normal.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_normalize.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_outputFile.c">
</File>
<File
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/BKE_action.h
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/BKE_action.h 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/BKE_action.h 2007-07-19 19:36:00 UTC (rev 11319)
@@ -153,11 +153,5 @@
};
#endif
-/* nla strip->mode, for action blending */
-enum {
- POSE_BLEND = 0,
- POSE_ADD
-};
-
#endif
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/BKE_blender.h 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/BKE_blender.h 2007-07-19 19:36:00 UTC (rev 11319)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 244
-#define BLENDER_SUBVERSION 2
+#define BLENDER_SUBVERSION 3
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h 2007-07-19 19:36:00 UTC (rev 11319)
@@ -33,43 +33,66 @@
#ifndef BKE_CONSTRAINT_H
#define BKE_CONSTRAINT_H
+
struct bConstraint;
+struct ListBase;
struct Object;
-struct ListBase;
struct bConstraintChannel;
+struct bPoseChannel;
struct bAction;
struct bArmature;
-/* Function prototypes */
+/* ---------------------------------------------------------------------------- */
+
+/* Constraint target/owner types */
+#define TARGET_OBJECT 1 /* string is "" */
+#define TARGET_BONE 2 /* string is bone-name */
+#define TARGET_VERT 3 /* string is vertex-group name */
+#define TARGET_CV 4 /* string is vertex-group name - is not available until curves get vgroups */
+
+/* ---------------------------------------------------------------------------- */
+
+/* special struct for use in constraint evaluation */
+typedef struct bConstraintOb {
+ struct Object *ob; /* if pchan, then armature that it comes from, otherwise constraint owner */
+ struct bPoseChannel *pchan; /* pose channel that owns the constraints being evaluated */
+
+ float matrix[4][4]; /* matrix where constraints are accumulated + solved */
+ float startmat[4][4]; /* original matrix (before constraint solving) */
+
+ short type; /* type of owner */
+} bConstraintOb;
+
+/* ---------------------------------------------------------------------------- */
+
+/* Constraint function prototypes */
void unique_constraint_name (struct bConstraint *con, struct ListBase *list);
void *new_constraint_data (short type);
-void evaluate_constraint (struct bConstraint *constraint, struct Object *ob, short ownertype, void *ownerdata, float targetmat[][4]);
void free_constraints (struct ListBase *conlist);
void copy_constraints (struct ListBase *dst, struct ListBase *src);
-void copy_constraint_channels (ListBase *dst, ListBase *src);
-void clone_constraint_channels (struct ListBase *dst, struct ListBase *src);
void relink_constraints (struct ListBase *list);
void free_constraint_data (struct bConstraint *con);
-/* channels */
+/* Constraint Channel function prototypes */
struct bConstraintChannel *get_constraint_channel (ListBase *list, const char *name);
struct bConstraintChannel *verify_constraint_channel (ListBase *list, const char *name);
+void do_constraint_channels (struct ListBase *conbase, struct ListBase *chanbase, float ctime);
+void copy_constraint_channels (ListBase *dst, ListBase *src);
+void clone_constraint_channels (struct ListBase *dst, struct ListBase *src);
void free_constraint_channels (ListBase *chanbase);
-/* Gemeric functions */
-void do_constraint_channels (struct ListBase *conbase, struct ListBase *chanbase, float ctime);
-short get_constraint_target_matrix (struct bConstraint *con, short ownertype, void *ownerdata, float mat[][4], float size[3], float time);
+/* Target function prototypes */
char constraint_has_target (struct bConstraint *con);
struct Object *get_constraint_target(struct bConstraint *con, char **subtarget);
void set_constraint_target(struct bConstraint *con, struct Object *ob, char *subtarget);
+/* Constraint Evaluation function prototypes */
+struct bConstraintOb *constraints_make_evalob (struct Object *ob, void *subdata, short datatype);
+void constraints_clear_evalob(struct bConstraintOb *cob);
-/* Constraint target/owner types */
-#define TARGET_OBJECT 1 // string is ""
-#define TARGET_BONE 2 // string is bone-name
-#define TARGET_VERT 3 // string is "VE:#"
-#define TARGET_FACE 4 // string is "FA:#"
-#define TARGET_CV 5 // string is "CV:#"
+short get_constraint_target_matrix (struct bConstraint *con, short ownertype, void *ownerdata, float mat[][4], float time);
+void solve_constraints (struct ListBase *conlist, struct bConstraintOb *cob, float ctime);
+
#endif
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/BKE_object.h 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/BKE_object.h 2007-07-19 19:36:00 UTC (rev 11319)
@@ -104,7 +104,6 @@
void minmax_object(struct Object *ob, float *min, float *max);
void minmax_object_duplis(struct Object *ob, float *min, float *max);
void solve_tracking (struct Object *ob, float targetmat[][4]);
-void solve_constraints (struct Object *ob, short obtype, void *obdata, float ctime);
void object_handle_update(struct Object *ob);
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c 2007-07-19 19:36:00 UTC (rev 11319)
@@ -126,7 +126,7 @@
}
/* constraint.c */
-void BPY_pyconstraint_eval(struct bPythonConstraint *con, float obmat[][4], short ownertype, void *ownerdata, float targetmat[][4])
+void BPY_pyconstraint_eval(struct bPythonConstraint *con, float ownermat[][4], float targetmat[][4])
{
}
int BPY_pyconstraint_targets(struct bPythonConstraint *con, float targetmat[][4])
Modified: branches/soc-2007-red_fox/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/soc-2007-red_fox/source/blender/blenkernel/intern/action.c 2007-07-19 19:12:51 UTC (rev 11318)
+++ branches/soc-2007-red_fox/source/blender/blenkernel/intern/action.c 2007-07-19 19:36:00 UTC (rev 11319)
@@ -225,12 +225,12 @@
{
bPoseChannel *chan;
- if (!pose){
+ if (!pose) {
return NULL;
}
/* See if this channel exists */
- for (chan=pose->chanbase.first; chan; chan=chan->next){
+ for (chan=pose->chanbase.first; chan; chan=chan->next) {
if (!strcmp (name, chan->name))
return chan;
}
@@ -239,7 +239,7 @@
chan = MEM_callocN(sizeof(bPoseChannel), "verifyPoseChannel");
strncpy (chan->name, name, 31);
- /* init vars to prevent mat errors */
+ /* init vars to prevent math errors */
chan->quat[0] = 1.0F;
chan->size[0] = chan->size[1] = chan->size[2] = 1.0F;
@@ -247,6 +247,8 @@
chan->limitmax[0]= chan->limitmax[1]= chan->limitmax[2]= 180.0f;
chan->stiffness[0]= chan->stiffness[1]= chan->stiffness[2]= 0.0f;
+ Mat4One(chan->constinv);
+
BLI_addtail (&pose->chanbase, chan);
return chan;
@@ -456,10 +458,10 @@
float dstweight;
switch (mode){
- case POSE_BLEND:
+ case ACTSTRIPMODE_BLEND:
dstweight = 1.0F - srcweight;
break;
- case POSE_ADD:
+ case ACTSTRIPMODE_ADD:
dstweight = 1.0F;
break;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list