diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2014-07-15 04:36:56 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-07-15 05:30:27 +0400 |
commit | 1bf87fa26c6763ef282ec39b07b678723a7f389b (patch) | |
tree | 14dcf327183bc94347f64c57fcfb26a002fee963 /source/blender/blenkernel/intern | |
parent | 50d30148b63212d4249b6e2aa97a5802557a9b6e (diff) |
BGE: TrackTo actuator: increasing up & track axis options
This is related to Task T34861 to increase up & track axis options for TrackTo actuator. I've just added it to differential to facilitate an easier review.
With the patch applied you can select X, Y and Z axis for the Up axis, and X, Y, Z, -X, -Y and -Z for the track axis.
Related to the implementation I have used the algorithm from Trackto constrain placed in constrain.c but adapted to be used with MOTO library.
The wiki docs are here (http://wiki.blender.org/index.php/User:Lordloki/Doc:2.6/Manual/Game_Engine/Logic/Actuators/Edit_Object#Trackto_Actuator).
Test file is here: {F97623}
I have also uploaded 2 screenshots showing the UI modifications to the TrackTo actuator:
{F91992} {F91990}
Reviewers: moguri, dfelinto
Reviewed By: moguri
CC: Genome36
Differential Revision: https://developer.blender.org/D565
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/sca.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 1310162483e..4be75344133 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -392,6 +392,7 @@ void init_actuator(bActuator *act) bSteeringActuator *sta; bArmatureActuator *arma; bMouseActuator *ma; + bEditObjectActuator *eoa; if (act->data) MEM_freeN(act->data); act->data= NULL; @@ -430,6 +431,9 @@ void init_actuator(bActuator *act) break; case ACT_EDIT_OBJECT: act->data= MEM_callocN(sizeof(bEditObjectActuator), "editobact"); + eoa = act->data; + eoa->upflag= ACT_TRACK_UP_Z; + eoa->trackflag= ACT_TRACK_TRAXIS_Y; break; case ACT_CONSTRAINT: act->data= MEM_callocN(sizeof(bConstraintActuator), "cons act"); |