Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2012-01-11 11:27:39 +0400
committerDalai Felinto <dfelinto@gmail.com>2012-01-11 11:27:39 +0400
commit782f0b63829a2c257a6e2942c49882f7fe04c33c (patch)
treeb7d421c7d4560167b8f71b4fb2d2fd2ad2d59daf /source/blender/makesrna/intern/rna_actuator.c
parent0effb45d58b75d96f8bc1be74affc43e99fe2a92 (diff)
bge camera actuator: -X and -Y axis
The camera actuator only allows to look the object from its front face. Given that Blender takes -Y as the default forward orientation, the current functionality doesn't let a camera to track an actor from behind. This patch allows for -X and -Y axis tracking. This way a camera over the shoulders of a character is possible (without resorting to rotate the mesh/armature original orientation. - patch reviewed by Campbell Barton, thanks
Diffstat (limited to 'source/blender/makesrna/intern/rna_actuator.c')
-rw-r--r--source/blender/makesrna/intern/rna_actuator.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c
index 612c34d1c92..6098e885df5 100644
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -867,8 +867,10 @@ static void rna_def_camera_actuator(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem prop_axis_items[] ={
- {ACT_CAMERA_X, "X", 0, "X", "Camera tries to get behind the X axis"},
- {ACT_CAMERA_Y, "Y", 0, "Y", "Camera tries to get behind the Y axis"},
+ {OB_POSX, "POS_X", 0, "+X", "Camera tries to get behind the X axis"},
+ {OB_POSY, "POS_Y", 0, "+Y", "Camera tries to get behind the Y axis"},
+ {OB_NEGX, "NEG_X", 0, "-X", "Camera tries to get behind the -X axis"},
+ {OB_NEGY, "NEG_Y", 0, "-Y", "Camera tries to get behind the -Y axis"},
{0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "CameraActuator", "Actuator");
@@ -905,7 +907,7 @@ static void rna_def_camera_actuator(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Damping", "Strength of the constraint that drives the camera behind the target");
RNA_def_property_update(prop, NC_LOGIC, NULL);
- /* x/y */
+ /* +x/+y/-x/-y */
prop= RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "axis");
RNA_def_property_enum_items(prop, prop_axis_items);