Skip to content

GrooveScribe 3 Toms #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenT-o wants to merge 6 commits into
base: master
Choose a base branch
from
Open

GrooveScribe 3 Toms #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d7c964
Added Mid Tom
BenT-o Mar 19, 2021
a1061f4
Added Toms
BenT-o Mar 19, 2021
ba389ac
Added mid tom compatability
BenT-o Mar 29, 2021
c0ac19e
Removed horizontal lines between buttons
BenT-o Mar 29, 2021
803a982
Adjusted samples for toms
BenT-o Mar 29, 2021
679c46c
Merge pull request #1 from BenT-o/toms
BenT-o Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions css/groove_writer_orange.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,15 @@
text-align: center;
visibility: hidden;
}
#tom2-label {
display: block;
white-space:nowrap;
margin-top: 5px;
margin-left: 8px;
cursor: pointer;
text-align: center;
visibility: hidden;
}
.snare-label {
margin-top: 5px;
margin-left: 8px;
Expand Down Expand Up @@ -403,6 +412,15 @@
-ms-user-select: none;
visibility: hidden;
}
#tom2-container {
height: 28px;
white-space:nowrap;
border: 1px solid transparent;
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
visibility: hidden;
}
.snare-container {
border: 1px solid transparent;
height: 28px;
Expand Down Expand Up @@ -605,7 +623,7 @@
color: transparent;
float:left;
}
.unmuteHHButton, .unmuteSnareButton, .unmuteKickButton, .unmuteTom1Button, .unmuteTom4Button {
.unmuteHHButton, .unmuteSnareButton, .unmuteKickButton, .unmuteTom1Button, .unmuteTom2Button, .unmuteTom4Button {
display: inline-block;
display: none;
position: relative;
Expand All @@ -618,7 +636,7 @@
margin-left: 2px;
cursor: pointer;
}
.unmuteHHButton:hover, .unmuteSnareButton:hover, .unmuteKickButton:hover, .unmuteTom1Button:hover, .unmuteTom4Button:hover {
.unmuteHHButton:hover, .unmuteSnareButton:hover, .unmuteKickButton:hover, .unmuteTom1Button:hover, .unmuteTom2Button:hover, .unmuteTom4Button:hover {
opacity: .6;
}
.unmuteHHStack {
Expand Down
31 changes: 25 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!--meta property="og:image" content="https://mikeslessons.com/groove/images/GScribe_Logo_on_orange.png"> -->
<meta property="og:description" content="Groove Scribe allows drummers to easily create grooves, listen, share, print sheet music, and more. Use the Groove Scribe to create new grooves, figure out the groove to your favorite song, or write down the groove to your latest tune."/>
<meta property="og:site_name" content="GrooveScribe at MikesLessons.com"/>
<meta property="og:site_name" content="GrooveScribe"/>

<script>
document.write('<meta property="og:image" content="https://gscribe-png-image.herokuapp.com/' + window.location.search + '">');
Expand All @@ -23,7 +23,7 @@

<link rel="stylesheet" type="text/css" href="font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/share-button.min.css">
<link rel="stylesheet" type="text/css" href="css/groove_writer_orange.css">
<link rel="stylesheet" type="text/css" href="css/groove_writer_orange.css">
<link rel="stylesheet" type="text/css" href="css/groove_display_orange.css">
<link href='https://fonts.googleapis.com/css?family=Lato:400,700,300' rel='stylesheet' type='text/css'>

Expand Down Expand Up @@ -260,11 +260,16 @@
</div>
<div class="noteContextMenu">
<ul id="stickingContextMenu" class="list">
<li onclick='myGrooveWriter.notePopupClick("sticking", "off");'>Off</li>
<li onclick='myGrooveWriter.notePopupClick("sticking", "count");'>Count</li>
</ul>
</div>
<div class="noteContextMenu">
<ul id="sticking2ContextMenu" class="list">
<li onclick='myGrooveWriter.notePopupClick("sticking", "off");'>Off</li>
<li onclick='myGrooveWriter.notePopupClick("sticking","right");'><b>R</b>ight</li>
<li onclick='myGrooveWriter.notePopupClick("sticking","left");'><b>L</b>eft</li>
<li onclick='myGrooveWriter.notePopupClick("sticking","both");'><b>R/L</b></li>
<li onclick='myGrooveWriter.notePopupClick("sticking", "count");'>Count</li>
</ul>
</div>
<div class="noteContextMenu">
Expand All @@ -289,6 +294,12 @@
<li onclick='myGrooveWriter.notePopupClick("tom1", "normal");'>Tom Normal</li>
</ul>
</div>
<div class="noteContextMenu">
<ul id="tom2ContextMenu" class="list">
<li onclick='myGrooveWriter.notePopupClick("tom2", "off");'>Off</li>
<li onclick='myGrooveWriter.notePopupClick("tom2", "normal");'>Tom Normal</li>
</ul>
</div>
<div class="noteContextMenu">
<ul id="tom4ContextMenu" class="list">
<li onclick='myGrooveWriter.notePopupClick("tom4", "off");'>Off</li>
Expand Down Expand Up @@ -317,9 +328,9 @@
<div class="noteContextMenu">
<ul id="stickingsLabelContextMenu" class="list">
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_off");'>all <b>Off</b></li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "alternate");'>alternate <b>R</b>/<b>L</b></li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_right");'>all <b>R</b>s</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_left");'>all <b>L</b>s</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "alternate");'>alternate <b>R</b>/<b>L</b></li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_right");'>all <b>R</b>s</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_left");'>all <b>L</b>s</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "all_count");'><b>C</b>ounts</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("stickings", "cancel");'>cancel</li>
</ul>
Expand All @@ -342,6 +353,14 @@
<li onclick='myGrooveWriter.noteLabelPopupClick("tom1", "cancel");'>cancel</li>
</ul>
</div>
<div class="noteContextMenu">
<ul id="tom2LabelContextMenu" class="list">
<li onclick='myGrooveWriter.noteLabelPopupClick("tom2", "all_off");'>all Toms <b>Off</b></li>
<li onclick='myGrooveWriter.noteLabelPopupClick("tom2", "all_on");'>all Toms <b>On</b></li>
<li id='mute_tom2_menu_item' onclick='myGrooveWriter.noteLabelPopupClick("tom2", "mute");'>mute tom sound</li>
<li onclick='myGrooveWriter.noteLabelPopupClick("tom2", "cancel");'>cancel</li>
</ul>
</div>
<div class="noteContextMenu">
<ul id="tom4LabelContextMenu" class="list">
<li onclick='myGrooveWriter.noteLabelPopupClick("tom4", "all_off");'>all Toms <b>Off</b></li>
Expand Down
3 changes: 2 additions & 1 deletion js/groove_display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ if (typeof(GrooveDisplay) === "undefined") {
if(GrooveDBTabIn.hihatTab !== undefined) myGrooveData.hh_array = myGrooveUtils.noteArraysFromURLData("H", GrooveDBTabIn.hihatTab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
myGrooveData.snare_array = myGrooveUtils.noteArraysFromURLData("S", combinedSnareTab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
myGrooveData.kick_array = myGrooveUtils.noteArraysFromURLData("K", combinedKickTab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
if(GrooveDBTabIn.tom1Tab !== undefined) myGrooveData.toms_array[0] = myGrooveUtils.noteArraysFromURLData("T1", GrooveDBTabIn.tom1Tab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
if(GrooveDBTabIn.tom1Tab !== undefined) myGrooveData.toms_array[0] = myGrooveUtils.noteArraysFromURLData("T1", GrooveDBTabIn.Tab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
if(GrooveDBTabIn.tom2Tab !== undefined) myGrooveData.toms_array[1] = myGrooveUtils.noteArraysFromURLData("T2", GrooveDBTabIn.tom2Tab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);
if(GrooveDBTabIn.tom4Tab !== undefined) myGrooveData.toms_array[3] = myGrooveUtils.noteArraysFromURLData("T4", GrooveDBTabIn.tom4Tab, GrooveDBTabIn.notesPerTabMeasure, GrooveDBTabIn.measures);

if(GrooveDBTabIn.timeSignature !== undefined) {
Expand Down
13 changes: 11 additions & 2 deletions js/groove_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,11 @@ function GrooveUtils() {
return root.GetEmptyGroove(notes_per_measure, numMeasures);
};

root.GetDefaultTom2Groove = function (notes_per_measure, timeSigTop, timeSigBottom, numMeasures) {

return root.GetEmptyGroove(notes_per_measure, numMeasures);
};

root.GetDefaultTom4Groove = function (notes_per_measure, timeSigTop, timeSigBottom, numMeasures) {

return root.GetEmptyGroove(notes_per_measure, numMeasures);
Expand Down Expand Up @@ -656,6 +661,9 @@ function GrooveUtils() {
case "T1":
return constant_ABC_T1_Normal;
//break;
case "T2":
return constant_ABC_T2_Normal;
//break;
case "T4":
return constant_ABC_T4_Normal;
//break;
Expand Down Expand Up @@ -1095,8 +1103,9 @@ function GrooveUtils() {
// only add if we need them. // they are long and ugly. :)
if (myGrooveData.showToms) {
var Tom1 = "&T1=|" + root.tabLineFromAbcNoteArray('T1', myGrooveData.toms_array[0], true, true, total_notes, myGrooveData.notesPerMeasure);
var Tom2 = "&T2=|" + root.tabLineFromAbcNoteArray('T2', myGrooveData.toms_array[1], true, true, total_notes, myGrooveData.notesPerMeasure);
var Tom4 = "&T4=|" + root.tabLineFromAbcNoteArray('T4', myGrooveData.toms_array[3], true, true, total_notes, myGrooveData.notesPerMeasure);
fullURL += Tom1 + Tom4;
fullURL += Tom1 + Tom2 + Tom4;
}

// only add if we need them. // they are long and ugly. :)
Expand Down Expand Up @@ -1227,7 +1236,7 @@ function GrooveUtils() {
'V:Hands stem=up \n' +
'%%voicemap drum\n' +
'"^Hi-Hat"^g4 "^Open"!open!^g4 ' +
'"^Crash"^c\'4 "^Stacker"^d\'4 "^Ride"^A\'4 "^Ride Bell"^B\'4 x2 "^Tom"e4 "^Tom"A4 "^Snare"c4 "^Buzz"!///!c4 "^Cross"^c4 "^Ghost "!(.!!).!c4 "^Flam"{/c}c4 x10 ||\n' +
'"^Crash"^c\'4 "^Stacker"^d\'4 "^Ride"^A\'4 "^Ride Bell"^B\'4 x2 "^H Tom"e4 "^M Tom"d4 "^F Tom"A4 "^Snare"c4 "^Buzz"!///!c4 "^Cross"^c4 "^Ghost "!(.!!).!c4 "^Flam"{/c}c4 x10 ||\n' +
'V:Feet stem=down \n' +
'%%voicemap drum\n' +
'x52 "^Kick"F4 "^HH foot"^d,4 x4 ||\n' +
Expand Down
Loading