diff --git a/js/_createColorPalette.js b/js/_createColorPalette.js index da51707..8f7352b 100644 --- a/js/_createColorPalette.js +++ b/js/_createColorPalette.js @@ -1,5 +1,5 @@ -function createColorPalette(selectedPalette, fillBackground, deletePreviousPalette = true) { +function createColorPalette(paletteColors, fillBackground, deletePreviousPalette = true) { //remove current palette if (deletePreviousPalette) { colors = document.getElementsByClassName('color-button'); @@ -11,8 +11,8 @@ function createColorPalette(selectedPalette, fillBackground, deletePreviousPalet var lightestColor = '#000000'; var darkestColor = '#ffffff'; - for (var i = 0; i < selectedPalette.length; i++) { - var newColor = selectedPalette[i]; + for (var i = 0; i < paletteColors.length; i++) { + var newColor = paletteColors[i]; var newColorElement = addColor(newColor); var newColorHex = hexToRgb(newColor); diff --git a/js/_presets.js b/js/_presets.js index bc4e02d..c0f4714 100644 --- a/js/_presets.js +++ b/js/_presets.js @@ -8,7 +8,7 @@ var presets = { 'PICO-8': { width: 128, height: 128, - palette: 'PICO-8', + palette: 'PICO-8' }, 'Commodore 64': { width: 40, diff --git a/js/_setCanvasOffset.js b/js/_setCanvasOffset.js index 695551b..3e34749 100644 --- a/js/_setCanvasOffset.js +++ b/js/_setCanvasOffset.js @@ -1,7 +1,7 @@ function setCanvasOffset (canvas, offsetLeft, offsetTop) { //horizontal offset var minXOffset = -canvasSize[0]*zoom+ 164; - var maxXOffset = window.innerWidth - 148; + var maxXOffset = window.innerWidth - 300; if (offsetLeft < minXOffset) canvas.style.left = minXOffset +'px'; diff --git a/views/pixel-editor.hbs b/views/pixel-editor.hbs index 3afca14..507f648 100644 --- a/views/pixel-editor.hbs +++ b/views/pixel-editor.hbs @@ -339,6 +339,12 @@ {{#specifiedPalette}} var keepUrl = true; {{/specifiedPalette}} + + // Set the default palettes + palettes["Commodore 64"] = {"name":"Commodore 64","author":"","colors":["000000","626262","898989","adadad","ffffff","9f4e44","cb7e75","6d5412","a1683c","c9d487","9ae29b","5cab5e","6abfc6","887ecb","50459b","a057a3"]} + palettes["PICO-8"] = {"name":"PICO-8","author":"","colors":["000000","1D2B53","7E2553","008751","AB5236","5F574F","C2C3C7","FFF1E8","FF004D","FFA300","FFEC27","00E436","29ADFF","83769C","FF77A8","FFCCAA"]} + palettes["Gameboy Color"] = {"name":"Nintendo Gameboy (Black Zero)","author":"","colors":["2e463d","385d49","577b46","7e8416"]} +