Changeset 29980 for main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js

Timestamp:

2015-06-15T21:12:16+12:00 (9 years ago)

Author:

davidb

Message:

Further changes as a result of preparing the final submission of the DLfM workshop paper

Location:

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js

Files:

• audiosynth.view.js (modified) (3 diffs)
• game-on.js (modified) (4 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js

@@ -325 +325 @@
     }
 
+
     if (e.shiftKey) {
         return fnDrumKeyboard(e);
+    }
+
+    if (e.altKey) {
+        return fnGuitarKeyboard(e);
     }
     
@@ -484 +489 @@
 
     var fnDrumKeyboard = function(e) {
-    //console.log("*** drum pressed: " + e.key);
-    if (e.key == "C") {
+    console.log("*** drum pressed keyCode: " + e.keyCode);
+    if (e.keyCode == "C".charCodeAt(0)) {
         $('#drum1').trigger("mousedown");
     }
-    else if (e.key == "V") {
+    else if (e.keyCode == "V".charCodeAt(0)) {
         $('#drum2').trigger("mousedown");
     }
-    else if (e.key == "B") {
+    else if (e.keyCode == "B".charCodeAt(0)) {
         $('#drum3').trigger("mousedown");
     }
-    else if (e.key == "N") {
+    else if (e.keyCode == "N".charCodeAt(0)) {
         $('#drum4').trigger("mousedown");
     }
-    else if (e.key == "M") {
+    else if (e.keyCode == "M".charCodeAt(0)) {
         $('#drum5').trigger("mousedown");
     }
@@ -504 +509 @@
     return true; // let other things outside of this piano/drum chain (such as the customGuitar input) see the event
     }
+
+
+
+
+
+    var fnGuitarKeyboard = function(e) {
+    console.log("*** guitar pressed keycode: " + e.keyCode);
+    if (e.keyCode == "Q".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-0').trigger("click");
+    }
+    else if (e.keyCode == "W".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-3').trigger("click");
+    }
+    else if (e.keyCode == "E".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-6').trigger("click");
+    }
+    else if (e.keyCode == "R".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-7').trigger("click");
+    }
+    else if (e.keyCode == "T".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-10').trigger("click");
+    }
+    else if (e.keyCode == "Y".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-13').trigger("click");
+    }
+    else if (e.keyCode == "U".charCodeAt(0)) {
+        $('#offscreen-jtab-chord-16').trigger("click");
+    }
+
+
+    e.preventDefault();
+    return true; // let other things outside of this piano/guitar chain see the event
+    }
+
 
 

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js

@@ -223 +223 @@
             var base_ctime = track_block.baseCTime;
             
+            var track_fill = track_block.fill;
+            var track_fillbackground = track_block.fillBackground;
+
             var block_events = track_block.events;
             
             var block_min_midi_pitch = num_midi_pitches-1;
             var block_max_midi_pitch = 0;
-
+            
             var block_events_len = block_events.length; 
             for (var ne=0; ne<block_events_len; ne++) {
@@ -244 +247 @@
             //rect.attr({stroke:"none", strokeWidth:0.2, fill:"#2E52A4"});
             //rect.attr({stroke:"black",fill:"#2E52A4"});
-            rect.attr({"stroke":"black","stroke-width":0.25, "fill":"#2E52A4"});
+            var fill = note_event.fill || track_fill || "#2E52A4";
+            rect.attr({"stroke":"black","stroke-width":0.25, "fill":fill});
             go_top_level_group.push(rect);
 
@@ -259 +263 @@
             var last_event = block_events[block_events_len-1];
             var last_note_off = last_event.midiNoteOff;
-            var block_duration = (base_ctime + last_note_off)/1000.0;
-
+            var block_duration = (base_ctime + last_note_off)/1000.0
+;
             var block_x_org = (base_ctime/total_duration) * go_paper_x_dim;
             var block_x_dim = (block_duration/total_duration) * go_paper_x_dim;
@@ -269 +273 @@
             if (gs.xsltParams.interface_name != "respooled") {
             var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor!
-            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"});
+            var fillbackground = track_fillbackground || "rgba(46, 82, 164, 0.5)";
+            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":fillbackground});
             
             var block_tip = track_block.name;