Skip to content

Commit 2b078e9

Browse files
committed
Added table legs
1 parent c01a534 commit 2b078e9

File tree

5 files changed

+29
-8
lines changed

5 files changed

+29
-8
lines changed

js/UI/NodeUI.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class NodeUI{
2626
<div id="node-` + (node.id) + `-UI-header" class="row center-x-spaced center-y">
2727
<div class="row center-y">
2828
<div class="sensor-color" style="background-color: #`+ node.color.getHexString() + `;"></div>
29-
<p class="main-text">Node + Sensor ` + (node.id + 1) + `</p>
29+
<p class="main-text">Sensor ` + (node.id + 1) + `</p>
3030
</div>
3131
<div class="row center-y">
3232
<!-- <div id="node-` + (node.id) + `-solo-button"><span class="iconify" data-icon="bx:search-alt-2"></span></div> -->

js/UI/Popup.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Popup{
9595

9696
/** PARAMETERS FUNCTIONS */
9797
this.setTrackingMode = function(mode){
98-
console.log('Setting tracking mode popup to', mode);
98+
//console.log('Setting tracking mode popup to', mode);
9999
trackingMode = mode;
100100

101101
switch(trackingMode)
@@ -113,7 +113,7 @@ class Popup{
113113
}
114114

115115
this.setHeightDetected = function(value){
116-
console.log("Setting detected height to ", value);
116+
//console.log("Setting detected height to ", value);
117117
heightDetected = value;
118118
document.getElementById("overlap-height-selection-popup").value = heightDetected;
119119
}
@@ -581,7 +581,6 @@ class Popup{
581581
const toggleElem = document.getElementById("toggle-outdoor-indoor");
582582
toggleElem.addEventListener('change', () => {
583583
let sceneEnvironment;
584-
console.log(toggleElem.checked);
585584
if(toggleElem.checked){
586585
sceneEnvironment = 'outdoor'
587586
} else{

js/UI/UIManager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class UIManager{
175175

176176
this.changeTrackingMode = function(trackingMode)
177177
{
178-
console.log('Setting tracking mode UI to ', trackingMode);
178+
//console.log('Setting tracking mode UI to ', trackingMode);
179179
//Displayed image
180180
document.getElementById("tracking-img").src = "img/" + String(trackingMode) + ".png";
181181

@@ -250,7 +250,7 @@ class UIManager{
250250
}
251251

252252
this.changeHeightDetected = function(value){
253-
console.log("changing height to ", value);
253+
//console.log("changing height to ", value);
254254
let text;
255255
switch (value) {
256256
case 1.2:

js/scene/Checkerboard.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Checkerboard{
2929
const sceneBorder = new LineSegments(new EdgesGeometry(), new LineBasicMaterial( { color: 0x000000 }));
3030
const planes = new Group();
3131
const dimensionsText = buildTextMesh(this.width, this.height);
32+
const tableLegs = new Group();
3233

3334

3435
function buildPlanes(width, height, elevation, unitValue)
@@ -132,6 +133,25 @@ class Checkerboard{
132133

133134
buildPlanes(width, height, elevation, unit.value);
134135
updateText(width, height, elevation, unit);
136+
createTableLegs(width, height, elevation, unit);
137+
}
138+
139+
function createTableLegs(width, height, elevation, unit){
140+
tableLegs.clear();
141+
const tableLegsGeometry = new BoxGeometry( 1/15, elevation, 1/15 );
142+
const material = new MeshBasicMaterial( {color: 0x111111, side: DoubleSide} );
143+
let leg1 = new Mesh( tableLegsGeometry, material );
144+
leg1.position.set(width, elevation/2, height);
145+
tableLegs.add(leg1);
146+
let leg2 = new Mesh( tableLegsGeometry, material );
147+
leg2.position.set(0, elevation/2, height);
148+
tableLegs.add(leg2);
149+
let leg3 = new Mesh( tableLegsGeometry, material );
150+
leg3.position.set(0, elevation/2, 0);
151+
tableLegs.add(leg3);
152+
let leg4 = new Mesh( tableLegsGeometry, material );
153+
leg4.position.set(width, elevation/2, 0);
154+
tableLegs.add(leg4);
135155
}
136156

137157
function applyTransforms(object, width, height, elevation)
@@ -154,6 +174,7 @@ class Checkerboard{
154174
scene.add(sceneBorder);
155175
scene.add(planes);
156176
scene.add(dimensionsText);
177+
scene.add(tableLegs);
157178
}
158179

159180
this.toggleUnit = function(unit)
@@ -183,6 +204,7 @@ class Checkerboard{
183204
scene.remove(sceneBorder);
184205
scene.remove(planes);
185206
scene.remove(dimensionsText);
207+
scene.remove(tableLegs);
186208
}
187209

188210
this.dispose = function()

js/scene/SceneManager.js

Lines changed: 2 additions & 2 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 parameter');
39+
//console.log('Setting parameter');
4040
this.notifyAllObservers(value);
4141
}
4242

4343
update(origin, value) {
44-
console.log('Updating parameter');
44+
//console.log('Updating parameter');
4545
this.notifyObserversExceptOrigin(origin, value);
4646
}
4747
}

0 commit comments

Comments
 (0)