Skip to content

Commit ade6780

Browse files
Rick1080pRick1080p
committed
readonly values and load scene from cookies fix
1 parent 1832f75 commit ade6780

File tree

5 files changed

+43
-44
lines changed

5 files changed

+43
-44
lines changed

‎js/Engine.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ class Engine{
2121

2222
uiManager.bindEventListeners(viewportManager);
2323
viewportManager.bindEventListeners();
24-
25-
sceneManager.bindObservers();
2624
}
2725

2826
function onWindowResize(viewportManager)

‎js/UI/Popup.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class Popup{
289289
document.getElementById('input-wall-y-scene-height-inspector').value = inputSceneHeight;
290290

291291
document.getElementById('dimensions-warning-message').classList.add('hidden');
292-
document.getElementById('scene-size-text-div').innerHTML= '<h3 id="scene-size-text">Scene size: <span data-unit=1>' + inputSceneWidth +'</span>x<span data-unit=1>'+ inputSceneLength +'</span>(<span data-unittext="1">m</span>)</h3>';
292+
document.getElementById('scene-size-text-div').innerHTML= '<h3 id="scene-size-text">Scene size: <span data-unit=1>' + inputSceneWidth +'</span>x<span data-unit=1>'+ inputSceneHeight +'</span>(<span data-unittext="1">m</span>)</h3>';
293293
return true;
294294
}
295295
else

‎js/UI/UIManager.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,16 @@ class UIManager{
181181

182182
switch (trackingMode) {
183183
case 'hand-tracking':
184+
document.getElementById("height-detection-text").classList.add("hidden");
185+
document.getElementById('scene-size-text-div').innerHTML= '<h3 id="scene-size-text">Scene size: <span data-unit=1>' + sceneManager.sceneWidth +'</span>x<span data-unit=1>'+ sceneManager.sceneWidth +'</span>(<span data-unittext="1">m</span>) with a sensor height of <span data-unit="1">' + sceneManager.sceneSensorHeight + '</span>(<span data-unittext="1">m</span>)</h3>';
186+
break;
184187
case 'wall-tracking':
185188
document.getElementById("height-detection-text").classList.add("hidden");
189+
document.getElementById('scene-size-text-div').innerHTML= '<h3 id="scene-size-text">Scene size: <span data-unit=1>' + sceneManager.sceneWidth +'</span>x<span data-unit=1>'+ sceneManager.sceneLength +'</span>(<span data-unittext="1">m</span>)</h3>';
186190
break;
187191
case 'human-tracking':
188192
document.getElementById("height-detection-text").classList.remove("hidden");
193+
document.getElementById('scene-size-text-div').innerHTML= '<h3 id="scene-size-text">Scene size: <span data-unit=1>' + sceneManager.sceneWidth +'</span>x<span data-unit=1>'+ sceneManager.sceneWidth +'</span>(<span data-unittext="1">m</span>) with a sensor height of <span data-unit="1">' + sceneManager.sceneSensorHeight + '</span>(<span data-unittext="1">m</span>)</h3>';
189194
break;
190195
default:
191196
break;
@@ -202,7 +207,7 @@ class UIManager{
202207
document.getElementById('floor-scene-size-title-inspector').innerHTML = "Table scene size";
203208
document.getElementById('wall-y-scene-size-inspector').classList.add('hidden');
204209

205-
document.getElementById("delete-all-lidars-button").dispatchEvent(new Event('click'));
210+
//document.getElementById("delete-all-lidars-button").dispatchEvent(new Event('click'));
206211

207212
document.getElementById('nodes-buttons').classList.remove('hidden');
208213
document.getElementById('lidars-buttons').classList.add('hidden');
@@ -219,7 +224,7 @@ class UIManager{
219224
document.getElementById('wall-y-scene-size-inspector').classList.remove('hidden');
220225
document.getElementById('floor-scene-size-inspector').classList.add('hidden');
221226

222-
document.getElementById("delete-all-nodes-button").dispatchEvent(new Event('click'));
227+
//document.getElementById("delete-all-nodes-button").dispatchEvent(new Event('click'));
223228

224229
document.getElementById('lidars-buttons').classList.remove('hidden');
225230
document.getElementById('nodes-buttons').classList.add('hidden');
@@ -234,7 +239,7 @@ class UIManager{
234239
document.getElementById('floor-scene-size-title-inspector').innerHTML = "Floor scene size";
235240
document.getElementById('wall-y-scene-size-inspector').classList.add('hidden');
236241

237-
document.getElementById("delete-all-lidars-button").dispatchEvent(new Event('click'));
242+
//document.getElementById("delete-all-lidars-button").dispatchEvent(new Event('click'));
238243

239244
document.getElementById('nodes-buttons').classList.remove('hidden');
240245
document.getElementById('lidars-buttons').classList.add('hidden');

‎js/scene/SceneManager.js‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ class ObservableParameter extends Observable {
3636
}
3737

3838
set(value) {
39-
console.log('Setting tracking mode');
39+
console.log('Setting parameter');
4040
this.notifyAllObservers(value);
4141
}
4242

4343
update(origin, value) {
44-
console.log('Updating tracking mode');
44+
console.log('Updating parameter');
4545
this.notifyObserversExceptOrigin(origin, value);
4646
}
4747
}
@@ -59,7 +59,7 @@ class SceneManager{
5959
static font;
6060
static DEFAULT_UNIT = units.meters;
6161
static DEFAULT_TRACKING_MODE = 'human-tracking';
62-
static DEFAULT_DETECTION_HEIGHT = document.getElementById('default-height-detected') ? parseFloat(document.getElementById('default-height-detected').value) : 1.2;
62+
static DEFAULT_DETECTION_HEIGHT = 1.2;
6363
static DEFAULT_WIDTH = 5;
6464
static DEFAULT_LENGTH = 5;
6565
static DEFAULT_ENV = 'indoor';
@@ -129,37 +129,6 @@ class SceneManager{
129129
//DEBUG
130130
const spheres = [];
131131
const rays = [];
132-
133-
this.bindObservers = function(){
134-
this.trackingModeObservable = new ObservableParameter();
135-
this.trackingModeObservable.addObserver(uiManager.changeTrackingMode);
136-
this.trackingModeObservable.addObserver(uiManager.popup.setTrackingMode);
137-
const changeTrackingModeBinded = this.changeTrackingMode.bind(this)
138-
this.trackingModeObservable.addObserver(changeTrackingModeBinded);
139-
140-
this.heightDetectedObservable = new ObservableParameter();
141-
this.heightDetectedObservable.addObserver(uiManager.changeHeightDetected);
142-
this.heightDetectedObservable.addObserver(uiManager.popup.setHeightDetected);
143-
const changeHeightDetectedBinded = this.changeHeightDetected.bind(this)
144-
this.heightDetectedObservable.addObserver(changeHeightDetectedBinded);
145-
146-
if(sceneObjects){
147-
148-
if(sceneObjects.trackingMode){
149-
this.trackingModeObservable.set(sceneObjects.trackingMode);
150-
} else {
151-
this.trackingModeObservable.set(SceneManager.DEFAULT_TRACKING_MODE);
152-
}
153-
if(sceneObjects.heightDetected){
154-
this.heightDetectedObservable.set(sceneObjects.heightDetected);
155-
} else {
156-
this.heightDetectedObservable.set(SceneManager.DEFAULT_DETECTION_HEIGHT);
157-
}
158-
} else {
159-
this.trackingModeObservable.set(SceneManager.DEFAULT_TRACKING_MODE);
160-
this.heightDetectedObservable.set(SceneManager.DEFAULT_DETECTION_HEIGHT);
161-
}
162-
}
163132

164133
/* SCENE INITIALISATION */
165134

@@ -207,6 +176,34 @@ class SceneManager{
207176

208177
//SceneObjects
209178
this.objects.initObjects();
179+
180+
this.trackingModeObservable = new ObservableParameter();
181+
this.trackingModeObservable.addObserver(uiManager.changeTrackingMode);
182+
this.trackingModeObservable.addObserver(uiManager.popup.setTrackingMode);
183+
const changeTrackingModeBinded = this.changeTrackingMode.bind(this)
184+
this.trackingModeObservable.addObserver(changeTrackingModeBinded);
185+
186+
this.heightDetectedObservable = new ObservableParameter();
187+
this.heightDetectedObservable.addObserver(uiManager.changeHeightDetected);
188+
this.heightDetectedObservable.addObserver(uiManager.popup.setHeightDetected);
189+
const changeHeightDetectedBinded = this.changeHeightDetected.bind(this)
190+
this.heightDetectedObservable.addObserver(changeHeightDetectedBinded);
191+
192+
if(sceneObjects){
193+
if(sceneObjects.trackingMode){
194+
this.trackingModeObservable.set(sceneObjects.trackingMode);
195+
} else {
196+
this.trackingModeObservable.set(SceneManager.DEFAULT_TRACKING_MODE);
197+
}
198+
if(sceneObjects.heightDetected){
199+
this.heightDetectedObservable.set(sceneObjects.heightDetected);
200+
} else {
201+
this.heightDetectedObservable.set(SceneManager.DEFAULT_DETECTION_HEIGHT);
202+
}
203+
} else {
204+
this.trackingModeObservable.set(SceneManager.DEFAULT_TRACKING_MODE);
205+
this.heightDetectedObservable.set(SceneManager.DEFAULT_DETECTION_HEIGHT);
206+
}
210207
}
211208

212209
/* BUILDERS */
@@ -371,7 +368,6 @@ class SceneManager{
371368
switch(mode)
372369
{
373370
case 'hand-tracking':
374-
this.heightDetected = SceneManager.HAND_TRACKING_OVERLAP_HEIGHT;
375371
this.sceneElevation = SceneManager.TABLE_ELEVATION;
376372

377373
if(this.augmentaSceneLoaded) {
@@ -382,7 +378,6 @@ class SceneManager{
382378
this.wallY.position.z = -10; // if you want to get the wall on checkerboard border, change this AND initialization values
383379
break;
384380
case 'wall-tracking':
385-
this.heightDetected = SceneManager.DEFAULT_DETECTION_HEIGHT;
386381
this.sceneElevation = 0;
387382

388383
if(this.augmentaSceneLoaded) {
@@ -394,7 +389,6 @@ class SceneManager{
394389
break;
395390
case 'human-tracking':
396391
default:
397-
this.heightDetected = SceneManager.DEFAULT_DETECTION_HEIGHT;
398392
this.sceneElevation = 0;
399393

400394
if(this.augmentaSceneLoaded) {

‎js/scene/objects/SceneObjects.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ class SceneObjects{
4747
//const sceneInfosStorage = sessionStorage.getItem('sceneInfos')
4848
// and comment this
4949
const sceneInfo = sessionStorage.getItem('sceneInfos')
50+
console.log(JSON.parse(sceneInfo));
5051
if(sceneInfo) {
5152
this.parseJson(sceneInfo);
5253
return;
5354
}
5455
}
55-
else if (sceneInfoFromURL) //scene from url case
56+
else //scene from url case
5657
{
5758
this.parseJson(sceneInfoFromURL);
5859
document.getElementById('popup').classList.remove('is-visible');
@@ -312,6 +313,7 @@ class SceneObjects{
312313
if(datas.hasOwnProperty('trackingMode'))
313314
{
314315
mode = datas.trackingMode;
316+
sceneManager.trackingMode = mode;
315317
}
316318

317319
if(datas.hasOwnProperty('sceneSize') && datas.sceneSize.length === 2)

0 commit comments

Comments
 (0)