diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-09-17 20:03:10 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-09-17 20:03:10 -0300 |
| commit | 990f6cf50e96213a4b1a2961e61a9b922cd75d71 (patch) | |
| tree | 600fb659508e8745d7656416b24f89b2157a2630 /demos/3d | |
| parent | 76aaa96d0e114d5293efed2fd0378ea390076b7e (diff) | |
More Bug Fixes
-=-=-=-=-=-=-
-Fixed a few bugs in Mixer, now playback of chiptunes works great :)
-Changed how visibility AABB generation from skeletons work, it's fully automatic and real-time now, generated from current skeleton pose for the frame.
-Fixed camera in 3D kinematic character demo.
Diffstat (limited to 'demos/3d')
| -rw-r--r-- | demos/3d/kinematic_char/follow_camera.gd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/3d/kinematic_char/follow_camera.gd b/demos/3d/kinematic_char/follow_camera.gd index 0b9ff9bbb2..60eef5787a 100644 --- a/demos/3d/kinematic_char/follow_camera.gd +++ b/demos/3d/kinematic_char/follow_camera.gd @@ -45,13 +45,13 @@ func _fixed_process(dt): var col = ds.intersect_ray(target,target,collision_exception) var col_right = ds.intersect_ray(target,target+Matrix3(up,deg2rad(-autoturn_ray_aperture)).xform(delta),collision_exception) - if (col!=null): + if (!col.empty()): #if main ray was occluded, get camera closer, this is the worst case scenario delta = col.position - target - elif (col_left!=null and col_right==null): + elif (!col_left.empty() and col_right.empty()): #if only left ray is occluded, turn the camera around to the right delta = Matrix3(up,deg2rad(-dt*autoturn_speed)).xform(delta) - elif (col_left==null and col_right!=null): + elif (col_left.empty() and !col_right.empty()): #if only right ray is occluded, turn the camera around to the left delta = Matrix3(up,deg2rad(dt*autoturn_speed)).xform(delta) else: |