Skip to content

Commit 34a64b5

Browse files
kovacsvkovacsv
committed
Introduce NavigationMode enum.
1 parent d7db144 commit 34a64b5

25 files changed

+133
-18
lines changed

‎docs/Class_Camera.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_EdgeSettings.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_EmbeddedViewer.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_EnvironmentSettings.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_InputFile.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_RGBAColor.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Class_RGBColor.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Enum_FileSource.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Enum_NavigationMode.html

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta http-equiv="content-type" content="text/html;charset=utf-8">
6+
<meta name="viewport" content="width=device-width, user-scalable=no">
7+
<link rel="icon" type="image/png" href="static/3dviewer_net_favicon.ico">
8+
9+
<title>Online 3D Viewer - NavigationMode</title>
10+
11+
<link rel="stylesheet" href="static/highlightjs/styles/github.min.css"/>
12+
<script src="static/highlightjs/highlight.min.js"></script>
13+
14+
<link rel="stylesheet" type="text/css" href="static/style.css"/>
15+
<script type="text/javascript" src="static/script.js"></script>
16+
</head>
17+
18+
<body>
19+
<div id="navigation_toggle" class="navigation_toggle"><img id="navigation_icon" src="static/menu.svg"/></div>
20+
<div id="navigation" class="navigation thin_scrollbar">
21+
<div class="navigation_section">
22+
<div class="navigation_title">Pages</div>
23+
<div id="nav-Home" class="navigation_item"><a href="index.html" target="_self">Home</a></div>
24+
<div id="nav-GitHub" class="navigation_item"><a href="https://github.com/kovacsv/Online3DViewer" target="_blank">GitHub</a></div>
25+
</div>
26+
<div class="navigation_section">
27+
<div class="navigation_title">Engine Usage</div>
28+
<div id="nav-Installation" class="navigation_item"><a href="Page_Installation.html" target="_self">Installation</a></div>
29+
<div id="nav-Usage" class="navigation_item"><a href="Page_Usage.html" target="_self">Usage</a></div>
30+
<div id="nav-Migration Guide" class="navigation_item"><a href="Page_MigrationGuide.html" target="_self">Migration Guide</a></div>
31+
</div>
32+
<div class="navigation_section">
33+
<div class="navigation_title">Contribution</div>
34+
<div id="nav-Contribution Guidelines" class="navigation_item"><a href="Page_ContributionGuidelines.html" target="_self">Contribution Guidelines</a></div>
35+
<div id="nav-Environment Setup" class="navigation_item"><a href="Page_EnvironmentSetup.html" target="_self">Environment Setup</a></div>
36+
</div>
37+
<div class="navigation_section">
38+
<div class="navigation_title">Classes</div>
39+
<div id="nav-Camera" class="navigation_item"><a href="Class_Camera.html" target="_self">Camera</a></div>
40+
<div id="nav-EdgeSettings" class="navigation_item"><a href="Class_EdgeSettings.html" target="_self">EdgeSettings</a></div>
41+
<div id="nav-EmbeddedViewer" class="navigation_item"><a href="Class_EmbeddedViewer.html" target="_self">EmbeddedViewer</a></div>
42+
<div id="nav-EnvironmentSettings" class="navigation_item"><a href="Class_EnvironmentSettings.html" target="_self">EnvironmentSettings</a></div>
43+
<div id="nav-InputFile" class="navigation_item"><a href="Class_InputFile.html" target="_self">InputFile</a></div>
44+
<div id="nav-RGBAColor" class="navigation_item"><a href="Class_RGBAColor.html" target="_self">RGBAColor</a></div>
45+
<div id="nav-RGBColor" class="navigation_item"><a href="Class_RGBColor.html" target="_self">RGBColor</a></div>
46+
</div>
47+
<div class="navigation_section">
48+
<div class="navigation_title">Functions</div>
49+
<div id="nav-Init3DViewerElements" class="navigation_item"><a href="Function_Init3DViewerElements.html" target="_self">Init3DViewerElements</a></div>
50+
<div id="nav-Init3DViewerFromFileList" class="navigation_item"><a href="Function_Init3DViewerFromFileList.html" target="_self">Init3DViewerFromFileList</a></div>
51+
<div id="nav-Init3DViewerFromUrlList" class="navigation_item"><a href="Function_Init3DViewerFromUrlList.html" target="_self">Init3DViewerFromUrlList</a></div>
52+
<div id="nav-SetExternalLibLocation" class="navigation_item"><a href="Function_SetExternalLibLocation.html" target="_self">SetExternalLibLocation</a></div>
53+
</div>
54+
<div class="navigation_section">
55+
<div class="navigation_title">Enums</div>
56+
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
58+
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
59+
</div>
60+
61+
</div>
62+
<div id="main" class="main">
63+
<h1>NavigationMode</h1>
64+
<div class="description">Camera navigation mode.</div>
65+
<h2>Values</h2>
66+
<div class="parameter_header">
67+
<span class="parameter_name">FixedUpVector</span>
68+
</div>
69+
<div class="parameter_main">
70+
<div class="parameter_description">Fixed up vector.</div>
71+
</div>
72+
<div class="parameter_header">
73+
<span class="parameter_name">FreeOrbit</span>
74+
</div>
75+
<div class="parameter_main">
76+
<div class="parameter_description">Free orbit.</div>
77+
</div>
78+
79+
</div>
80+
<script type="text/javascript">Init ('NavigationMode')</script>
81+
</body>
82+
83+
</html>

‎docs/Enum_ProjectionMode.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Function_Init3DViewerElements.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Function_Init3DViewerFromFileList.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Function_Init3DViewerFromUrlList.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Function_SetExternalLibLocation.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Page_ContributionGuidelines.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Page_EnvironmentSetup.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Page_Installation.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Page_MigrationGuide.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/Page_Usage.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎docs/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<div class="navigation_section">
5555
<div class="navigation_title">Enums</div>
5656
<div id="nav-FileSource" class="navigation_item"><a href="Enum_FileSource.html" target="_self">FileSource</a></div>
57+
<div id="nav-NavigationMode" class="navigation_item"><a href="Enum_NavigationMode.html" target="_self">NavigationMode</a></div>
5758
<div id="nav-ProjectionMode" class="navigation_item"><a href="Enum_ProjectionMode.html" target="_self">ProjectionMode</a></div>
5859
</div>
5960

‎source/engine/main.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { ParameterListBuilder, ParameterListParser, CreateUrlBuilder, CreateUrlP
6565
import { ModelToThreeConversionParams, ModelToThreeConversionOutput, ThreeConversionStateHandler, ThreeNodeTree, ConvertModelToThreeObject } from './threejs/threeconverter.js';
6666
import { ThreeModelLoader } from './threejs/threemodelloader.js';
6767
import { ThreeColorConverter, ThreeLinearToSRGBColorConverter, ThreeSRGBToLinearColorConverter, HasHighpDriverIssue, GetShadingType, ConvertThreeColorToColor, ConvertColorToThreeColor, ConvertThreeGeometryToMesh, DisposeThreeObjects, ShadingType } from './threejs/threeutils.js';
68-
import { Camera, CameraIsEqual3D, ProjectionMode } from './viewer/camera.js';
68+
import { Camera, CameraIsEqual3D, NavigationMode, ProjectionMode } from './viewer/camera.js';
6969
import { GetIntegerFromStyle, GetDomElementExternalWidth, GetDomElementExternalHeight, GetDomElementInnerDimensions, GetDomElementClientCoordinates, CreateDomElement, AddDomElement, AddDiv, ClearDomElement, InsertDomElementBefore, InsertDomElementAfter, ShowDomElement, IsDomElementVisible, SetDomElementWidth, SetDomElementHeight, GetDomElementOuterWidth, GetDomElementOuterHeight, SetDomElementOuterWidth, SetDomElementOuterHeight, CreateDiv } from './viewer/domutils.js';
7070
import { EmbeddedViewer, Init3DViewerFromUrlList, Init3DViewerFromFileList, Init3DViewerElements } from './viewer/embeddedviewer.js';
7171
import { MouseInteraction, TouchInteraction, ClickDetector, Navigation, NavigationType } from './viewer/navigation.js';
@@ -296,6 +296,7 @@ export {
296296
ShadingType,
297297
Camera,
298298
CameraIsEqual3D,
299+
NavigationMode,
299300
ProjectionMode,
300301
GetIntegerFromStyle,
301302
GetDomElementExternalWidth,

‎source/engine/viewer/camera.js

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
import { CoordIsEqual3D } from '../geometry/coord3d.js';
22
import { IsEqual } from '../geometry/geometry.js';
33

4+
/**
5+
* Camera navigation mode.
6+
* @enum
7+
*/
8+
export const NavigationMode =
9+
{
10+
/** Fixed up vector. */
11+
FixedUpVector : 1,
12+
/** Free orbit. */
13+
FreeOrbit : 2
14+
};
15+
416
/**
517
* Camera projection mode.
618
* @enum

‎source/engine/viewer/navigation.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Coord2D, CoordDistance2D, SubCoord2D } from '../geometry/coord2d.js';
22
import { CoordDistance3D, CrossVector3D, SubCoord3D, VectorAngle3D } from '../geometry/coord3d.js';
33
import { DegRad, IsGreater, IsLower, IsZero } from '../geometry/geometry.js';
44
import { ParabolicTweenFunction, TweenCoord3D } from '../geometry/tween.js';
5-
import { CameraIsEqual3D } from './camera.js';
5+
import { CameraIsEqual3D, NavigationMode } from './camera.js';
66
import { GetDomElementClientCoordinates } from './domutils.js';
77

88
export class MouseInteraction
@@ -241,7 +241,7 @@ export class Navigation
241241
this.canvas = canvas;
242242
this.camera = camera;
243243
this.callbacks = callbacks;
244-
this.fixUpVector = true;
244+
this.navigationMode = NavigationMode.FixedUpVector;
245245

246246
this.mouse = new MouseInteraction ();
247247
this.touch = new TouchInteraction ();
@@ -282,14 +282,14 @@ export class Navigation
282282
this.onContext = onContext;
283283
}
284284

285-
IsFixUpVector ()
285+
GetNavigationMode ()
286286
{
287-
return this.fixUpVector;
287+
return this.navigationMode;
288288
}
289289

290-
SetFixUpVector (isFixUpVector)
290+
SetNavigationMode (navigationMode)
291291
{
292-
this.fixUpVector = isFixUpVector;
292+
this.navigationMode = navigationMode;
293293
}
294294

295295
GetCamera ()
@@ -522,14 +522,14 @@ export class Navigation
522522
let viewDirection = SubCoord3D (this.camera.center, this.camera.eye).Normalize ();
523523
let horizontalDirection = CrossVector3D (viewDirection, this.camera.up).Normalize ();
524524

525-
if (this.fixUpVector) {
525+
if (this.navigationMode === NavigationMode.FixedUpVector) {
526526
let originalAngle = VectorAngle3D (viewDirection, this.camera.up);
527527
let newAngle = originalAngle + radAngleY;
528528
if (IsGreater (newAngle, 0.0) && IsLower (newAngle, Math.PI)) {
529529
this.camera.eye.Rotate (horizontalDirection, -radAngleY, this.camera.center);
530530
}
531531
this.camera.eye.Rotate (this.camera.up, -radAngleX, this.camera.center);
532-
} else {
532+
} else if (this.navigationMode === NavigationMode.FreeOrbit) {
533533
let verticalDirection = CrossVector3D (horizontalDirection, viewDirection).Normalize ();
534534
this.camera.eye.Rotate (horizontalDirection, -radAngleY, this.camera.center);
535535
this.camera.eye.Rotate (verticalDirection, -radAngleX, this.camera.center);

‎source/engine/viewer/viewer.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Coord3D, CoordDistance3D, SubCoord3D } from '../geometry/coord3d.js';
22
import { DegRad, Direction, IsEqual } from '../geometry/geometry.js';
33
import { ColorComponentToFloat } from '../model/color.js';
44
import { ShadingType } from '../threejs/threeutils.js';
5-
import { Camera, ProjectionMode } from './camera.js';
5+
import { Camera, NavigationMode, ProjectionMode } from './camera.js';
66
import { GetDomElementInnerDimensions } from './domutils.js';
77
import { Navigation } from './navigation.js';
88
import { ShadingModel } from './shadingmodel.js';
@@ -353,16 +353,16 @@ export class Viewer
353353
this.Render ();
354354
}
355355

356-
IsFixUpVector ()
356+
GetNavigationMode ()
357357
{
358-
return this.navigation.IsFixUpVector ();
358+
return this.navigation.GetNavigationMode ();
359359
}
360360

361-
SetFixUpVector (isFixUpVector)
361+
SetNavigationMode (navigationMode)
362362
{
363363
let oldCamera = this.navigation.GetCamera ();
364-
let newCamera = this.upVector.SetFixed (isFixUpVector, oldCamera);
365-
this.navigation.SetFixUpVector (isFixUpVector);
364+
let newCamera = this.upVector.SetFixed (navigationMode === NavigationMode.FixedUpVector, oldCamera);
365+
this.navigation.SetNavigationMode (navigationMode);
366366
if (newCamera !== null) {
367367
this.navigation.MoveCamera (newCamera, this.settings.animationSteps);
368368
}

0 commit comments

Comments
 (0)