josh/lifeEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed hotkeys, removed comments

Browse Source
This commit is contained in:
Max Robinson
2021-11-28 17:03:20 -06:00
parent 549b11ad12
commit 4f85e1cc9d
3 changed files with 47 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dist/index.html vendored
View File

@@ -19,12 +19,12 @@
<div class='control-panel'> <div class='control-panel'>
<div id='speed-controller' class='control-set'> <div id='speed-controller' class='control-set'>
<div class='vertical-buttons'> <div class='vertical-buttons'>
<button class="reset-view" title="Reset View. Hotkey: 1"><i class="fa fa-video-camera"></i></button> <button class="reset-view" title="Reset View. Hotkey: a"><i class="fa fa-video-camera"></i></button>
<button class="edit-mode-btn drag-view" id="drag-view" title="Drag View. Hotkey: 2"><i class="fa fa-arrows"></i></button> <button class="edit-mode-btn drag-view" id="drag-view" title="Drag View. Hotkey: s"><i class="fa fa-arrows"></i></button>
<button class="edit-mode-btn wall-drop" id="wall-drop" title="Drop/Remove Wall. Hotkey: 3"><i class="fa fa-square"></i></button> <button class="edit-mode-btn wall-drop" id="wall-drop" title="Drop/Remove Wall. Hotkey: d"><i class="fa fa-square"></i></button>
<button class="edit-mode-btn food-drop" id="food-drop" title="Drop/Remove Food. Hotkey: 4"><i class="fa fa-cutlery"></i></button> <button class="edit-mode-btn food-drop" id="food-drop" title="Drop/Remove Food. Hotkey: f"><i class="fa fa-cutlery"></i></button>
<button class="edit-mode-btn click-kill" id="click-kill" title="Click to kill. Hotkey: 5"><i class="fa fa-bolt"></i></button> <button class="edit-mode-btn click-kill" id="click-kill" title="Click to kill. Hotkey: g"><i class="fa fa-bolt"></i></button>
<button id="clear-walls" title="Clear All Walls. Hotkey: x"><i class="fa fa-window-close"></i></button> <button id="clear-walls" title="Clear All Walls. Hotkey: b"><i class="fa fa-window-close"></i></button>
</div> </div>
<h2>Simulation Speed</h2> <h2>Simulation Speed</h2>
<input id="slider" type="range" min="1" max="300" value="60"> <input id="slider" type="range" min="1" max="300" value="60">
@@ -62,7 +62,7 @@
<p class='tabnav-item' id='hyperparameters'>Simulation Controls</p> <p class='tabnav-item' id='hyperparameters'>Simulation Controls</p>
<p class='tabnav-item' id='stats'>Stats</p> <p class='tabnav-item' id='stats'>Stats</p>
<p class='tabnav-item' id='challenges'>Challenges</p> <p class='tabnav-item' id='challenges'>Challenges</p>
<button id="minimize" title="Minimze Control Panel. Hotkey: i"><i class="fa fa-minus-square"></i></button> <button id="minimize" title="Minimze Control Panel."><i class="fa fa-minus-square"></i></button>
</div> </div>
<div id='about' class='tab'> <div id='about' class='tab'>
@@ -98,9 +98,9 @@
<div id='editor' class='tab'> <div id='editor' class='tab'>
<div class='left-half' id='editor-panel'> <div class='left-half' id='editor-panel'>
<div class='editor-buttons'> <div class='editor-buttons'>
<button class="edit-mode-btn select" id="select" title="Select organism from world. Hotkey: s"><i class="fa fa-hand-pointer-o"></i></button> <button class="edit-mode-btn select" id="select" title="Select organism from world. Hotkey: z"><i class="fa fa-hand-pointer-o"></i></button>
<button class="edit-mode-btn edit" id="edit" title="Edit organism. Hotkey: e"><i class="fa fa-pencil"></i></button> <button class="edit-mode-btn edit" id="edit" title="Edit organism. Hotkey: x"><i class="fa fa-pencil"></i></button>
<button class="edit-mode-btn drop-org" id="drop-org" title="Drop organism in world. Hotkey: d"><i class="fa fa-plus"></i></button> <button class="edit-mode-btn drop-org" id="drop-org" title="Drop organism in world. Hotkey: c"><i class="fa fa-plus"></i></button>
</div> </div>
<div id='editor-env'> <div id='editor-env'>
<canvas id='editor-canvas'></canvas> <canvas id='editor-canvas'></canvas>
@@ -261,19 +261,19 @@
</div> </div>
</div> </div>
<div class='hot-controls'> <div class='hot-controls'>
<button class="reset-view" title="Reset View. Hotkey: 1"><i class="fa fa-video-camera"></i></button> <button class="reset-view" title="Reset View. Hotkey: a"><i class="fa fa-video-camera"></i></button>
<button class="edit-mode-btn drag-view" id="drag-view" title="Drag View. Hotkey: 2"><i class="fa fa-arrows"></i></button> <button class="edit-mode-btn drag-view" id="drag-view" title="Drag View. Hotkey: s"><i class="fa fa-arrows"></i></button>
<button class="edit-mode-btn wall-drop" id="wall-drop" title="Drop/Remove Wall. Hotkey: 3"><i class="fa fa-square"></i></button> <button class="edit-mode-btn wall-drop" id="wall-drop" title="Drop/Remove Wall. Hotkey: d"><i class="fa fa-square"></i></button>
<button class="edit-mode-btn food-drop" id="food-drop" title="Drop/Remove Food. Hotkey: 4"><i class="fa fa-cutlery"></i></button> <button class="edit-mode-btn food-drop" id="food-drop" title="Drop/Remove Food. Hotkey: f"><i class="fa fa-cutlery"></i></button>
<button class="edit-mode-btn click-kill" id="click-kill" title="Click to kill. Hotkey: 5"><i class="fa fa-bolt"></i></button> <button class="edit-mode-btn click-kill" id="click-kill" title="Click to kill. Hotkey: g"><i class="fa fa-bolt"></i></button>
<button class='pause-button' title="Play/Pause. Hotkey: 6"><i class="fa fa-pause"></i></button> <button class="headless" title="Toggle rendering. Hotkey: h"><i class="fa fa-eye-slash"></i></button>
<button class="headless" title="Toggle rendering. Hotkey: 7"><i class="fa fa-eye-slash"></i></button> <button class='pause-button' title="Play/Pause. Hotkey: j/space"><i class="fa fa-pause"></i></button>
</div> </div>
<div id="headless-notification"> <div id="headless-notification">
<i class="fa fa-eye-slash" ></i> <i class="fa fa-eye-slash" ></i>
</div> </div>
<div id='maximize-hot-control' class='hot-controls'> <div id='maximize-hot-control' class='hot-controls'>
<button id="maximize" title="Show Control Panel. Hotkey: i"><i class="fa fa-plus-square"></i></button> <button id="maximize" title="Show Control Panel."><i class="fa fa-plus-square"></i></button>
</div> </div>
</body> </body>

77
src/Controllers/ControlPanel.js
View File

@@ -42,82 +42,52 @@ class ControlPanel {
this.stats_panel.startAutoRender(); this.stats_panel.startAutoRender();
} }
}); });
// var self = this;
// $('#minimize').click ( function() {
// $('.control-panel').css('display', 'none');
// $('.hot-controls').css('display', 'block');
// }.bind(this));
// $('#maximize').click ( function() {
// $('.control-panel').css('display', 'grid');
// $('.hot-controls').css('display', 'none');
// if (self.tab_id == 'stats') {
// self.stats_panel.startAutoRender();
// }
// });
} }
defineHotkeys() { defineHotkeys() {
$('body').keydown( (e) => {
$('body').keydown( (evt) => { switch (e.key.toLowerCase()) {
//console.log(evt.which);
switch (evt.which) {
// hot bar controls // hot bar controls
case 49: // 1 = Reset Camera case 'a':
$('.reset-view')[0].click(); $('.reset-view')[0].click();
break; break;
case 's':
case 50: // 2 = Drag View
$('#drag-view').click(); $('#drag-view').click();
break; break;
case 'd':
case 51: // 3 = Drop Wall
$('#wall-drop').click(); $('#wall-drop').click();
break; break;
case 'f':
case 52: // 4 = Drop Food
$('#food-drop').click(); $('#food-drop').click();
break; break;
case 'g':
case 53: // 5 = Kill
$('#click-kill').click(); $('#click-kill').click();
break; break;
case 'h':
case 54: // 6 = Play/Pause
case 32: // Space = Play/Pause
$('.pause-button')[0].click();
break;
case 55: // 7 = Toggle Rendering
$('.headless')[0].click(); $('.headless')[0].click();
break; break;
case 'j':
case ' ':
$('.pause-button')[0].click();
break;
// miscellaneous hotkeys // miscellaneous hotkeys
case 9: // tab = toggle control panel case 'q': // minimize/maximize control panel
evt.preventDefault(); e.preventDefault();
if (this.control_panel_active) if (this.control_panel_active)
$('#minimize').click(); $('#minimize').click();
else else
$('#maximize').click(); $('#maximize').click();
break; break;
case 'z':
case 68: // d = drop organism
$('#drop-org').click();
break;
case 69: // e = edit organism
$('#edit').click();
break;
case 83: // s = select creature mode
$('#select').click(); $('#select').click();
break; break;
case 'x':
case 86: // v = Toggle HUD $('#edit').click();
break;
case 'c':
$('#drop-org').click();
break;
case 'v': // toggle hud
if (this.no_hud) { if (this.no_hud) {
let control_panel_display = this.control_panel_active ? 'grid' : 'none'; let control_panel_display = this.control_panel_active ? 'grid' : 'none';
let hot_control_display = !this.control_panel_active ? 'block' : 'none'; let hot_control_display = !this.control_panel_active ? 'block' : 'none';
@@ -133,8 +103,7 @@ class ControlPanel {
} }
this.no_hud = !this.no_hud; this.no_hud = !this.no_hud;
break; break;
case 'b':
case 88: // x = clear all walls
$('#clear-walls').click(); $('#clear-walls').click();
} }
}); });

31
src/Controllers/EnvironmentController.js
View File

@@ -28,33 +28,14 @@ class EnvironmentController extends CanvasController{
// Restrict scale // Restrict scale
scale = Math.max(0.5, this.scale+(sign*zoom_speed)); scale = Math.max(0.5, this.scale+(sign*zoom_speed));
//if (scale != 0.5) { var cur_top = parseInt($('#env-canvas').css('top'));
var cur_left = parseInt($('#env-canvas').css('left'));
var cur_top = parseInt($('#env-canvas').css('top')); var diff_x = (this.canvas.width/2 - this.mouse_x) * (scale - this.scale);
var cur_left = parseInt($('#env-canvas').css('left')); var diff_y = (this.canvas.height/2 - this.mouse_y) * (scale - this.scale);
var diff_x = (this.canvas.width/2 - this.mouse_x) * (scale - this.scale); $('#env-canvas').css('top', (cur_top+diff_y)+'px');
var diff_y = (this.canvas.height/2 - this.mouse_y) * (scale - this.scale); $('#env-canvas').css('left', (cur_left+diff_x)+'px');
/* -- Original Zoom procedure
if (sign == 1) {
// If we're zooming in, zoom towards wherever the mouse is
var diff_x = ((this.canvas.width/2-cur_left/this.scale) - this.mouse_x)*scale/1.5;
var diff_y = ((this.canvas.height/2-cur_top/this.scale) - this.mouse_y)*scale/1.5;
}
else {
// If we're zooming out, zoom out towards the center
var diff_x = -cur_left/scale;
var diff_y = -cur_top/scale;
var new_left = cur_left - cur_left / scale;
var new_top = cur_top - cur_top / scale;
}
*/
$('#env-canvas').css('top', (cur_top+diff_y)+'px');
$('#env-canvas').css('left', (cur_left+diff_x)+'px');
//}
// Apply scale transform // Apply scale transform
el.style.transform = `scale(${scale})`; el.style.transform = `scale(${scale})`;