Permalink
Browse files

fixed the assignment of orientation to timed motion quaternion

  • Loading branch information...
1 parent 33a132a commit e0c6c7cb848335cbe01e925cd95dbbf4a94e6833 @danielrh danielrh committed May 10, 2012
Showing with 9 additions and 3 deletions.
  1. +1 −1 externals/protojs
  2. +8 −2 katajs/oh/plugins/sirikata/SirikataSpaceConnection.js
Submodule protojs updated 1 files
+11 −6 pbj.js
@@ -185,7 +185,7 @@ Kata.require([
var orient = new Sirikata.Protocol.TimedMotionQuaternion();
orient.t = this._toSpaceTime(loc.time);
if (loc.orient)
- loc.orient = loc.orient;
+ orient.position = loc.orient;
if (loc.rotvel != undefined && loc.rotaxis != undefined)
orient.velocity = Kata.Quaternion.fromAxisAngle(loc.rotaxis, loc.rotvel).array(); // FIXME angular velocity
result.orient = orient;
@@ -227,7 +227,13 @@ Kata.require([
Kata.LocationCopyUnifyTime(loc, reqloc);
if (resetTime) {
- delete loc.time;
+ delete reqloc.time;
+ if (reqloc.posTime!==undefined)
+ delete reqloc.posTime;
+ if (reqloc.orientTime!==undefined)
+ delete reqloc.orientTime;
+ if (reqloc.scaleTime!==undefined)
+ delete reqloc.scaleTime;
}
reqloc.visual = loc.visual;
this.mOutstandingConnectRequests[objid] =

0 comments on commit e0c6c7c

Please sign in to comment.