Skip to content

Commit 89208a9

Browse files
authored
Camera controller US english update (#320)
* Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar
1 parent de5754e commit 89208a9

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed
-100 Bytes
Loading

src/main/java/com/esri/samples/scene/choose_camera_controller/ChooseCameraControllerSample.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void start(Stage stage){
9393
GraphicsOverlay sceneGraphicsOverlay = new GraphicsOverlay();
9494
sceneView.getGraphicsOverlays().add(sceneGraphicsOverlay);
9595

96-
// create a graphic with a ModelSceneSymbol of an aeroplane to add to the scene
96+
// create a graphic with a ModelSceneSymbol of a plane to add to the scene
9797
String modelURI = new File("./samples-data/bristol/Collada/Bristol.dae").getAbsolutePath();
9898
ModelSceneSymbol plane3DSymbol = new ModelSceneSymbol(modelURI, 1.0);
9999
plane3DSymbol.loadAsync();
@@ -106,10 +106,10 @@ public void start(Stage stage){
106106
Camera camera = new Camera(38.459291, -109.937576, 5500, 150.0, 20.0, 0.0);
107107
sceneView.setViewpointCamera(camera);
108108

109-
// instantiate a new camera controller which orbits the aeroplane at a set distance
110-
OrbitGeoElementCameraController orbitAeroplaneCameraController = new OrbitGeoElementCameraController(plane3D, 100.0);
111-
orbitAeroplaneCameraController.setCameraPitchOffset(30);
112-
orbitAeroplaneCameraController.setCameraHeadingOffset(150);
109+
// instantiate a new camera controller which orbits the plane at a set distance
110+
OrbitGeoElementCameraController orbitPlaneCameraController = new OrbitGeoElementCameraController(plane3D, 100.0);
111+
orbitPlaneCameraController.setCameraPitchOffset(30);
112+
orbitPlaneCameraController.setCameraHeadingOffset(150);
113113

114114
// instantiate a new camera controller which orbits a target location
115115
Point locationPoint = new Point(-109.929589, 38.437304, 1700, SpatialReferences.getWgs84());
@@ -118,19 +118,19 @@ public void start(Stage stage){
118118
orbitLocationCameraController.setCameraHeadingOffset(150);
119119

120120
// create radio buttons for choosing camera controller
121-
RadioButton orbitAeroplane = new RadioButton("ORBIT CAMERA AROUND AEROPLANE");
121+
RadioButton orbitPlane = new RadioButton("ORBIT CAMERA AROUND PLANE");
122122
RadioButton orbitLocation = new RadioButton("ORBIT CAMERA AROUND CRATER");
123123
RadioButton globeCamera = new RadioButton("FREE PAN ROUND THE GLOBE");
124124
globeCamera.setSelected(true);
125125

126126
// set the buttons to a toggle group
127127
ToggleGroup toggleGroup = new ToggleGroup();
128-
orbitAeroplane.setToggleGroup(toggleGroup);
128+
orbitPlane.setToggleGroup(toggleGroup);
129129
orbitLocation.setToggleGroup(toggleGroup);
130130
globeCamera.setToggleGroup(toggleGroup);
131131

132132
// set the radio buttons to choose which camera controller is active
133-
orbitAeroplane.setOnAction(event -> sceneView.setCameraController(orbitAeroplaneCameraController));
133+
orbitPlane.setOnAction(event -> sceneView.setCameraController(orbitPlaneCameraController));
134134

135135
orbitLocation.setOnAction(event -> sceneView.setCameraController(orbitLocationCameraController));
136136

@@ -143,7 +143,7 @@ public void start(Stage stage){
143143
controlsVBox.setMaxSize(300, 80);
144144
controlsVBox.getStyleClass().add("panel-region");
145145
// add radio buttons to the control panel
146-
controlsVBox.getChildren().addAll(orbitAeroplane, orbitLocation, globeCamera);
146+
controlsVBox.getChildren().addAll(orbitPlane, orbitLocation, globeCamera);
147147

148148
// add scene view, label and control panel to the stack pane
149149
stackPane.getChildren().addAll(sceneView, controlsVBox);

src/main/java/com/esri/samples/scene/choose_camera_controller/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<h2>How to use the sample</h2>
1212

13-
<p> The application loads with the default globe camera controller. To rotate and fix the scene around the aeroplane, exit globe mode by choosing the "Orbit camera around aeroplane" option (i.e. camera will now be fixed to the aeroplane). Choose the "Orbit camera around crater" option to rotate and centre the scene around the location of the Upheaval Dome crater structure, or choose the "Free pan round the globe" option to return to default free navigation.</p>
13+
<p> The application loads with the default globe camera controller. To rotate and fix the scene around the plane, exit globe mode by choosing the "Orbit camera around plane" option (i.e. camera will now be fixed to the plane). Choose the "Orbit camera around crater" option to rotate and centre the scene around the location of the Upheaval Dome crater structure, or choose the "Free pan round the globe" option to return to default free navigation.</p>
1414

1515
<h2>How it works</h2>
1616

src/main/java/com/esri/samples/scene/orbit_the_camera_around_an_object/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929

3030
<h2>How to use the sample</h2>
3131

32-
<p> The sample loads with the camera orbiting an aeroplane model. The camera is preset with a restricted camera heading and pitch, and a limited minimum and maximum camera distance set from the plane. The position of the plane on the screen is also set just below center.</p>
32+
<p> The sample loads with the camera orbiting an plane model. The camera is preset with a restricted camera heading and pitch, and a limited minimum and maximum camera distance set from the plane. The position of the plane on the screen is also set just below center.</p>
3333

3434

3535
<p> Use the "Camera Heading" slider to adjust the camera heading. Select the "Allow camera distance interaction" checkbox to allow zooming in and out with the mouse/keyboard: when the checkbox is deselected the user will be unable to adjust with the camera distance.</p>
3636

3737
<p> Use the "Plane Pitch" slider to adjust the plane's pitch. When not in Cockpit view, the plane's pitch will change independently to that of the camera pitch.</p>
3838

39-
<p>Use the "Cockpit view" button to offset and fix the camera into the cockpit of the aeroplane. Use the "Plane pitch" slider to control the pitch of aeroplane: the camera will follow the pitch of the plane in this mode. In this view adjusting the camera distance is disabled. Hit the "Center view" button to exit cockpit view mode and fix the camera controller on the center of the plane.</p>
39+
<p>Use the "Cockpit view" button to offset and fix the camera into the cockpit of the plane. Use the "Plane pitch" slider to control the pitch of plane: the camera will follow the pitch of the plane in this mode. In this view adjusting the camera distance is disabled. Hit the "Center view" button to exit cockpit view mode and fix the camera controller on the center of the plane.</p>
4040

4141
<h2>How it works</h2>
4242

0 commit comments

Comments
 (0)