change widget home button to use camera flights #803

hpinkos · 2013-05-28T21:48:54Z

No description provided.

mramato · 2013-05-29T14:43:06Z

Source/Widgets/HomeButton/HomeButtonViewModel.js

@@ -120,12 +123,14 @@ define(['../createCommand',
         */
        this.transitioner = transitioner;

+        this.flightDuration = flightDuration;


This should be an observable knockout.observable(flightDuration). It also needs doc, something like "Gets an Observable whose value is the duration in milliseconds of the flight to home position."

hpinkos · 2013-05-29T15:12:12Z

@mramato better?

emackey · 2013-05-29T15:25:05Z

The camera flight has some weirdness. From the home position, spin the globe to the opposite side, looking at India, and zoom in about 50%. Then click the home button. The globe actually leaves the screen and comes back. I'm pretty sure it's @bagnell's code doing this (sorry Dan!) so if needed this could be moved to a separate issue.

mramato · 2013-05-29T17:16:19Z

Source/Widgets/HomeButton/HomeButtonViewModel.js

@@ -121,11 +124,16 @@ define(['../createCommand',
        this.transitioner = transitioner;

        /**
+         * Gets an Observable whose value is the duration in milliseconds of the flight to home position.
+         */


Needs @type Observable

mramato · 2013-05-29T17:17:01Z

So is the issue @emackey pointed out definitely outside this pull request? @hpinkos did I notice you opening a separate issue for it?

hpinkos · 2013-05-29T17:22:27Z

@mramato, I agree with @emackey that it's the CameraFlightPath that's generating that behavior. I think it should be a separate issue. I've opened issues for two other camera flight path things, not one for this yet though. Should I open an issue?

emackey · 2013-05-29T17:31:29Z

I'm OK with this being merged before the above three are fixed. Is there some mechanism to disable flights for users that don't want them?

mramato · 2013-05-29T17:40:06Z

Settings flightDuration to 0 should do that, but we should make sure it works as expected.

mramato · 2013-05-29T18:33:02Z

This is awesome, but I did find one more problem. Load simple.czml and click on the facility. When you hit home, it stays locked onto the facility even though it returns to the home position. I don't believe this happens in master. I think the transforms are no longer being set properly. We need to make sure this works for each scene mode.

mramato · 2013-05-29T18:34:39Z

Source/Widgets/HomeButton/HomeButtonViewModel.js

         * The command for switching to home view.
         * @type Command
         */
        this.command = createCommand(function() {
-            viewHome(that.scene, that.ellipsoid, that.transitioner);
+            viewHome(that.scene, that.ellipsoid, that.transitioner, that.flightDuration);


Instead of that.flightDuration, pass in that.flightDuration() so that the viewHome just deals with the raw value and not the observable.

hpinkos · 2013-05-29T19:31:32Z

@mramato when duration is 0, nothing happens. and good catch with the transforms thing. Do you think these changes should be made in CameraFlightPath or just for the home button? I was thinking CameraFlightPath because I feel like this should be default behavior for all camera flights.

mramato · 2013-05-29T19:49:00Z

Probably a question for @bagnell but I think the answer is the home button, unless the CameraFlightPath stuff is earth specific. Dan?

hpinkos · 2013-05-29T22:12:23Z

@bagnell can you take a look at the changes I made to CameraFlightPath? I decided to do the camera position change in the onComplete function so it will execute when it's added to an AnimationCollection. Do you think that's reasonable? Thanks =)

mramato · 2013-05-30T21:40:47Z

@bagnell don't forget to look at this.

bagnell · 2013-05-31T17:32:15Z

Source/Scene/CameraFlightPath.js

+            var newOnComplete = function() {
+                var position = destination;
+                if (frameState.mode === SceneMode.SCENE3D) {
+                    dirScratch = defaultValue(description.direction, position.negate(dirScratch).normalize(dirScratch));


You should only do this if both direction and up are undefined. Otherwise, just compute right as direction.cross(up).

Compute the direction in the if below when its undefined and just use description.direction in the else block.

Same comment for up. The reason to do this is that the arguments to defaultValue will be evaluated when its called.

bagnell · 2013-05-31T17:43:58Z

@hpinkos Looks good to me. I just had some comments about computing the camera orientation.

Conflicts: Source/Widgets/HomeButton/HomeButton.js Source/Widgets/HomeButton/HomeButtonViewModel.js

…onCameraFlight

…tion

hpinkos · 2013-06-10T20:20:49Z

Thanks @bagnell, I finally got the 2D check for same camera positino to work. Is there anything else I need to change?

bagnell · 2013-06-11T17:52:01Z

Source/Scene/CameraFlightPath.js

+                    }
+                    upScratch = defaultValue(description.up, rightScratch.cross(dirScratch, upScratch));
+                } else {
+                    dirScratch = defaultValue(description.direction, Cartesian3.UNIT_Z.negate(dirScratch));


Same comment.

bagnell · 2013-06-11T17:59:07Z

@hpinkos Just a few more comments. Make sure to add tests so that the new conditionals are executed.

@mramato Want to do the final merge when this is ready?

hpinkos · 2013-06-11T19:05:04Z

@bagnell anything else?

mramato · 2013-06-11T19:06:26Z

@bagnell I'm in a meeting all day, you can go ahead and merge this if you're happy with it.

bagnell · 2013-06-11T20:46:09Z

Merging.

change widget home button to use camera flights

change home button to use camera flights

2f0b6a4

mramato reviewed May 29, 2013
View reviewed changes

minor changes

c7d66e3

mramato reviewed May 29, 2013
View reviewed changes

doc

5e26f36

This was referenced May 29, 2013

Camera flights around the globe #805

Closed

Camera flight path in 2D tries to fly through the map #804

Closed

Camera flight path in Columbus View ends at wrong destination #802

Closed

mramato reviewed May 29, 2013
View reviewed changes

change flight duration call

9603513

hpinkos added 3 commits May 29, 2013 16:42

correct camera.transform

6b38462

go to destination if duration <= 0

2813901

new camera flight path test

75a55ed

bagnell reviewed May 31, 2013
View reviewed changes

hpinkos added 5 commits June 4, 2013 14:18

index on homeButtonCameraFlight: 75a55ed new camera flight path test

2641c22

On homeButtonCameraFlight: 2d position match

9f22c14

Merge remote-tracking branch 'agi/master' into homeButtonCameraFlight

2e754bd

Conflicts: Source/Widgets/HomeButton/HomeButton.js Source/Widgets/HomeButton/HomeButtonViewModel.js

Merge commit '9f22c14f2d8fcd7476889ba3780099e09527f40a' into homeButt…

edbe002

…onCameraFlight

don't compute animation if 2D destination is the same as current posi…

e0c4427

…tion

bagnell reviewed Jun 11, 2013
View reviewed changes

hpinkos added 2 commits June 11, 2013 14:45

fix if statement

8dca6a0

add more tests

309f7ed

bagnell added a commit that referenced this pull request Jun 11, 2013

Merge pull request #803 from hpinkos/homeButtonCameraFlight

45cd217

change widget home button to use camera flights

bagnell merged commit 45cd217 into CesiumGS:master Jun 11, 2013

hpinkos deleted the homeButtonCameraFlight branch June 11, 2013 20:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

change widget home button to use camera flights #803

change widget home button to use camera flights #803

hpinkos commented May 28, 2013

mramato May 29, 2013

hpinkos commented May 29, 2013

emackey commented May 29, 2013

mramato May 29, 2013

mramato commented May 29, 2013

hpinkos commented May 29, 2013

emackey commented May 29, 2013

mramato commented May 29, 2013

mramato commented May 29, 2013

mramato May 29, 2013

hpinkos commented May 29, 2013

mramato commented May 29, 2013

hpinkos commented May 29, 2013

mramato commented May 30, 2013

bagnell May 31, 2013

bagnell Jun 11, 2013

bagnell Jun 11, 2013

bagnell commented May 31, 2013

hpinkos commented Jun 10, 2013

bagnell Jun 11, 2013

bagnell commented Jun 11, 2013

hpinkos commented Jun 11, 2013

mramato commented Jun 11, 2013

bagnell commented Jun 11, 2013

change widget home button to use camera flights #803

change widget home button to use camera flights #803

Conversation

hpinkos commented May 28, 2013

mramato May 29, 2013

Choose a reason for hiding this comment

hpinkos commented May 29, 2013

emackey commented May 29, 2013

mramato May 29, 2013

Choose a reason for hiding this comment

mramato commented May 29, 2013

hpinkos commented May 29, 2013

emackey commented May 29, 2013

mramato commented May 29, 2013

mramato commented May 29, 2013

mramato May 29, 2013

Choose a reason for hiding this comment

hpinkos commented May 29, 2013

mramato commented May 29, 2013

hpinkos commented May 29, 2013

mramato commented May 30, 2013

bagnell May 31, 2013

Choose a reason for hiding this comment

bagnell Jun 11, 2013

Choose a reason for hiding this comment

bagnell Jun 11, 2013

Choose a reason for hiding this comment

bagnell commented May 31, 2013

hpinkos commented Jun 10, 2013

bagnell Jun 11, 2013

Choose a reason for hiding this comment

bagnell commented Jun 11, 2013

hpinkos commented Jun 11, 2013

mramato commented Jun 11, 2013

bagnell commented Jun 11, 2013