Skip to content

Commit a87298c

Browse files
committed
Overlap options for wall&table + no click on tabs
1 parent 2b078e9 commit a87298c

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed

css/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ textarea:focus {
680680
height: 100%;
681681
width: 10vw;
682682
padding: 1vh 0;
683-
cursor: pointer;
683+
cursor:default;
684684
}
685685

686686
.tab > h3 {

index.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,20 @@ <h3>Hardware</h3>
8181
<option value="2">Entire body</option>
8282
</select>
8383
</div>
84+
<div id="setup-target-overlap-wall" class="popup-target-overlap-select hidden">
85+
<p>Target overlap detection</p>
86+
<select title="overlap-wall-popup" name="overlap-wall-popup" id="overlap-wall-selection-popup">
87+
<option value="1.2" selected>Hand tracking</option>
88+
<option value="1.6">Finger tracking</option>
89+
<option value="2">Large objects</option>
90+
</select>
91+
</div>
92+
<div id="setup-target-overlap-table" class="popup-target-overlap-select hidden">
93+
<p>Target overlap detection</p>
94+
<select title="overlap-table-popup" name="overlap-table-popup" id="overlap-table-selection-popup">
95+
<option value="1.2" selected>Hand tracking</option>
96+
</select>
97+
</div>
8498
<div id="setup-warning-message" class="row center-x hidden">
8599
<p id="setup-warning-text" class="warning-text">Please choose a surface to track</p>
86100
</div>

js/UI/Popup.js

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,19 @@ class Popup{
101101
switch(trackingMode)
102102
{
103103
case 'wall-tracking':
104+
document.getElementById("setup-target-overlap-wall").classList.remove("hidden");
105+
document.getElementById("setup-target-overlap-table").classList.add("hidden");
106+
document.getElementById("setup-target-overlap").classList.add("hidden");
107+
break;
104108
case 'hand-tracking':
105-
document.getElementById("setup-target-overlap").classList.add("hidden")
109+
document.getElementById("setup-target-overlap-table").classList.remove("hidden");
110+
document.getElementById("setup-target-overlap").classList.add("hidden");
111+
document.getElementById("setup-target-overlap-wall").classList.add("hidden");
106112
break;
107113
case 'human-tracking':
108114
document.getElementById("setup-target-overlap").classList.remove("hidden");
115+
document.getElementById("setup-target-overlap-wall").classList.add("hidden");
116+
document.getElementById("setup-target-overlap-table").classList.add("hidden");
109117
break;
110118
default:
111119
break;
@@ -152,36 +160,6 @@ class Popup{
152160
});
153161
}
154162

155-
document.getElementById('setup-tab').addEventListener('click', () => {
156-
initSetupSection();
157-
158-
document.getElementById('dimensions-content').classList.add('hidden');
159-
document.getElementById('hardware-content').classList.add('hidden');
160-
document.getElementById('setup-content').classList.remove('hidden');
161-
162-
sessionStorage.setItem('builderStep', 0);
163-
});
164-
165-
document.getElementById('dimensions-tab').addEventListener('click', () => {
166-
initDimensionsSection();
167-
168-
document.getElementById('setup-content').classList.add('hidden');
169-
document.getElementById('hardware-content').classList.add('hidden');
170-
document.getElementById('dimensions-content').classList.remove('hidden');
171-
172-
sessionStorage.setItem('builderStep', 1);
173-
});
174-
175-
document.getElementById('hardware-tab').addEventListener('click', () => {
176-
initHardwareSection();
177-
178-
document.getElementById('setup-content').classList.add('hidden');
179-
document.getElementById('dimensions-content').classList.add('hidden');
180-
document.getElementById('hardware-content').classList.remove('hidden');
181-
182-
sessionStorage.setItem('builderStep', 2);
183-
});
184-
185163
/* TODO ADVANCED TRACKING MODES
186164
document.getElementById('tracking-mode-advanced').addEventListener('click', () => {
187165
const trackingModeChoices = document.getElementById('tracking-mode-selection-builder').children;

0 commit comments

Comments
 (0)