Mindfang/cardconjurer
1
0
Fork 0
forked from GithubMirrors/cardconjurer
Code Pull Requests Actions Packages Activity

GCS

Browse Source
This commit is contained in:
Kyle
2020-12-20 10:14:19 -08:00
parent 5433a2bb45
commit d2602c12e4
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess
View File

@@ -13,4 +13,7 @@ ErrorDocument 404 /404.php
<filesMatch "\.(js)$"> <filesMatch "\.(js)$">
Header set Cache-Control "max-age=604800, public" Header set Cache-Control "max-age=604800, public"
</filesMatch> </filesMatch>
<files creator.js>
Header set Cache-Control "max-age=0, public"
</files>
</IfModule> </IfModule>

73
js/creator.js
View File

@@ -2,42 +2,15 @@
var params = new URLSearchParams(window.location.search); var params = new URLSearchParams(window.location.search);
//To save the server from being overloaded? Maybe? //To save the server from being overloaded? Maybe?
function fixUri(input) { function fixUri(input) {
var prefix = 'https://raw.githubusercontent.com/ImKyle4815/cardconjurer/remake'; var prefix = 'https://storage.googleapis.com/card-conjurer';//'https://raw.githubusercontent.com/ImKyle4815/cardconjurer/remake';
if (input.includes(prefix) || input.includes('http') || params.get('testing')) { if (input.includes(prefix) || input.includes('http') || input.includes('data:image') || params.get('testing')) {
return input; return input;
} else { } else {
return prefix + input; //input.replace('/img/frames', prefix + '/img/frames'); return prefix + input; //input.replace('/img/frames', prefix + '/img/frames');
} }
} }
//card object //card object
var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:'/img/blank.png', artX:0, artY:0, artZoom:1, setSymbolSource:'/img/blank.png', setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:'/img/blank.png', watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]}; var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:fixUri('/img/blank.png'), artX:0, artY:0, artZoom:1, setSymbolSource:fixUri('/img/blank.png'), setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:fixUri('/img/blank.png'), watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]};
//art
art = new Image();
art.crossOrigin = 'anonymous';
art.src = fixUri('/img/blank.png');
art.onerror = function() {this.src = fixUri('/img/blank.png');}
art.onload = artEdited;
//set symbol
setSymbol = new Image();
setSymbol.crossOrigin = 'anonymous';
setSymbol.src = fixUri('/img/blank.png');
setSymbol.onerror = function() {this.src = fixUri('/img/blank.png');}
setSymbol.onload = setSymbolEdited;
//watermark
watermark = new Image();
watermark.crossOrigin = 'anonymous';
watermark.src = fixUri('/img/blank.png');
watermark.onerror = function() {this.src = fixUri('/img/blank.png');}
watermark.onload = watermarkEdited;
//preview canvas
var previewCanvas = document.querySelector('#previewCanvas');
var previewContext = previewCanvas.getContext('2d');
var canvasList = [];
//frame/mask picker stuff
var availableFrames = [];
var selectedFrameIndex = 0;
var selectedMaskIndex = 0;
var selectedTextIndex = 0;
//core images/masks //core images/masks
const black = new Image(); black.src = fixUri('/img/black.png'); const black = new Image(); black.src = fixUri('/img/black.png');
black.crossOrigin = 'anonymous'; black.crossOrigin = 'anonymous';
@@ -49,6 +22,33 @@ const middle = new Image(); middle.src = fixUri('/img/frames/maskMiddleThird.png
middle.crossOrigin = 'anonymous'; middle.crossOrigin = 'anonymous';
const corner = new Image(); corner.src = fixUri('/img/frames/cornerCutout.png'); const corner = new Image(); corner.src = fixUri('/img/frames/cornerCutout.png');
corner.crossOrigin = 'anonymous'; corner.crossOrigin = 'anonymous';
//art
art = new Image();
art.crossOrigin = 'anonymous';
art.src = blank.src;
// art.onerror = function() {this.src = fixUri('/img/blank.png');}
art.onload = artEdited;
//set symbol
setSymbol = new Image();
setSymbol.crossOrigin = 'anonymous';
setSymbol.src = blank.src;
// setSymbol.onerror = function() {this.src = fixUri('/img/blank.png');}
setSymbol.onload = setSymbolEdited;
//watermark
watermark = new Image();
watermark.crossOrigin = 'anonymous';
watermark.src = blank.src;
// watermark.onerror = function() {this.src = fixUri('/img/blank.png');}
watermark.onload = watermarkEdited;
//preview canvas
var previewCanvas = document.querySelector('#previewCanvas');
var previewContext = previewCanvas.getContext('2d');
var canvasList = [];
//frame/mask picker stuff
var availableFrames = [];
var selectedFrameIndex = 0;
var selectedMaskIndex = 0;
var selectedTextIndex = 0;
//for imports //for imports
var scryfallArt; var scryfallArt;
var scryfallCard; var scryfallCard;
@@ -295,7 +295,7 @@ function frameOptionClicked(event) {
} }
clickedFrameOption.classList.add('selected'); clickedFrameOption.classList.add('selected');
selectedFrameIndex = getElementIndex(clickedFrameOption); selectedFrameIndex = getElementIndex(clickedFrameOption);
document.querySelector('#mask-picker').innerHTML = '<div class="mask-option selected" onclick="maskOptionClicked(event)"><img src="' + fixUri('/img/black.png') + '"><p>No Mask</p></div>'; document.querySelector('#mask-picker').innerHTML = '<div class="mask-option selected" onclick="maskOptionClicked(event)"><img src="' + black.src + '"><p>No Mask</p></div>';
selectedMaskIndex = 0; selectedMaskIndex = 0;
document.querySelector('#selectedPreview').innerHTML = '(Selected: ' + availableFrames[selectedFrameIndex].name + ', No Mask)'; document.querySelector('#selectedPreview').innerHTML = '(Selected: ' + availableFrames[selectedFrameIndex].name + ', No Mask)';
if (availableFrames[selectedFrameIndex].masks) { if (availableFrames[selectedFrameIndex].masks) {
@@ -345,16 +345,13 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
frameToAdd.masks.forEach(item => { frameToAdd.masks.forEach(item => {
item.image = new Image(); item.image = new Image();
item.image.crossOrigin = 'anonymous'; item.image.crossOrigin = 'anonymous';
item.image.src = fixUri('/img/blank.png'); item.image.src = blank.src;
item.image.onload = drawFrames; item.image.onload = drawFrames;
item.image.src = fixUri(item.src); item.image.src = fixUri(item.src);
}); });
frameToAdd.image = new Image(); frameToAdd.image = new Image();
frameToAdd.crossOrigin = 'anonymous';
if (frameToAdd.name == 'Uploaded Image') {
frameToAdd.image.crossOrigin = 'anonymous' frameToAdd.image.crossOrigin = 'anonymous'
} frameToAdd.image.src = blank.src;
frameToAdd.image.src = fixUri('/img/blank.png');
frameToAdd.image.onload = drawFrames; frameToAdd.image.onload = drawFrames;
frameToAdd.image.src = fixUri(frameToAdd.src); frameToAdd.image.src = fixUri(frameToAdd.src);
if (!loadingFrame) { if (!loadingFrame) {
@@ -378,7 +375,7 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
if (maskThumbnail) { if (maskThumbnail) {
frameElementMask.src = fixUri(frameToAdd.masks[0].src.replace('.png', 'Thumb.png')); frameElementMask.src = fixUri(frameToAdd.masks[0].src.replace('.png', 'Thumb.png'));
} else { } else {
frameElementMask.src = fixUri('/img/black.png'); frameElementMask.src = black.src;
} }
frameElement.appendChild(frameElementMask); frameElement.appendChild(frameElementMask);
var frameElementLabel = document.createElement('h4'); var frameElementLabel = document.createElement('h4');
@@ -1164,7 +1161,7 @@ async function imageLocal(event, destination, otherParams) {
destination(reader.result, otherParams); destination(reader.result, otherParams);
} }
reader.onerror = function () { reader.onerror = function () {
destination('/img/blank.png', otherParams); // destination('/img/blank.png', otherParams);
} }
await reader.readAsDataURL(event.target.files[0]); await reader.readAsDataURL(event.target.files[0]);
} }