Compare View

switch
from
...
to
 
Commits (3)
index.html
... ... @@ -161,26 +161,6 @@
161 161 </div>
162 162 </div>
163 163  
164   - <!-- Modal w/ trigger -->
165   - <button id="triggerModal" type="button" class="btn hide" data-toggle="modal" data-target="#exampleModal"></button>
166   - <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
167   - <div class="modal-dialog" role="document">
168   - <div class="modal-content">
169   - <div class="modal-header">
170   - <h5 class="modal-title" id="exampleModalLabel">Ugyldig</h5>
171   - <button type="button" class="close" data-dismiss="modal" aria-label="Close">
172   - <span aria-hidden="true">&times;</span>
173   - </button>
174   - </div>
175   - <div class="modal-body">
176   - Vennligst oppgi positive numeriske verdier
177   - </div>
178   - <div class="modal-footer">
179   - <button type="button" class="btn btn-secondary" data-dismiss="modal">Lukk</button>
180   - </div>
181   - </div>
182   - </div>
183   - </div>
184 164 </div>
185 165  
186 166 </div>
... ... @@ -189,6 +169,29 @@
189 169  
190 170 </div>
191 171  
  172 + <!-- User input error modal -->
  173 + <div id="error-modal">
  174 + <button id="triggerModal" type="button" class="btn hide" data-toggle="modal" data-target="#exampleModal"></button>
  175 + <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
  176 + <div class="modal-dialog" role="document">
  177 + <div class="modal-content">
  178 + <div class="modal-header">
  179 + <h5 class="modal-title" id="exampleModalLabel">Ugyldig</h5>
  180 + <button type="button" class="close" data-dismiss="modal" aria-label="Close">
  181 + <span aria-hidden="true">&times;</span>
  182 + </button>
  183 + </div>
  184 + <div class="modal-body">
  185 + Vennligst oppgi positive numeriske verdier
  186 + </div>
  187 + <div class="modal-footer">
  188 + <button type="button" class="btn btn-secondary" data-dismiss="modal">Lukk</button>
  189 + </div>
  190 + </div>
  191 + </div>
  192 + </div>
  193 + </div>
  194 +
192 195 <!-- Custom terrace wrapper -->
193 196 <div class="custom-terrace-wrapper hide" id="testWrapper">
194 197  
... ...
js/HTMLGUI.js
... ... @@ -116,7 +116,7 @@ function toggleHelplines() {
116 116 if(terrace.terraceMaterial)
117 117 terrace.mesh.material = terrace.terraceMaterial;
118 118 else {
119   - terrace.changeTerraceMaterial("images/menu_terrace_texture_1.png");
  119 + terrace.changeTerraceMaterial("images/menu_terrace_texture_9.png");
120 120 }
121 121 terrace.grid = false;
122 122 terrace.hideMeasurements();
... ...
js/app.js
... ... @@ -42,7 +42,6 @@ var layout;
42 42 var measurements;
43 43 /*---------------------------------*/
44 44  
45   -var terraceMaterial = undefined;
46 45 var menuVisible = true;
47 46 /*---------------------------------*/
48 47 var gui;
... ...
js/camera/CameraController.js
... ... @@ -14,7 +14,7 @@ class CameraController {
14 14 setUpCameras() {
15 15 this.focusPerspectiveCamera();
16 16 this.orthographicCamera.setDefaultZoom(terrace.width > terrace.depth ? terrace.width : terrace.depth);
17   - this.orthographicCamera.setDefaultTarget(terrace.width / 2, terrace.depth);
  17 + this.orthographicCamera.setDefaultTarget(terrace.width / 2, terrace.depth + 10);
18 18  
19 19 this.perspectiveMode();
20 20 }
... ...
js/terrace/CustomTerrace.js
... ... @@ -4,6 +4,8 @@ class CustomTerrace {
4 4 this.needsUpdate = true;
5 5 this.inputValue = 1000;
6 6  
  7 + camera.orthographicCamera.setDefaultZoom(4000);
  8 + camera.orthographicCamera.setDefaultTarget(3300, 2800);
7 9 camera.orthographicMode();
8 10 this.initButtons();
9 11 this.initLines();
... ...