Skip to content
Snippets Groups Projects
Commit b63d784c authored by Hotte's avatar Hotte
Browse files

GOL angepasst und mini layout anpassung

parent 8190549b
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
"enddate": "30.11.2016" "enddate": "30.11.2016"
}, },
{ {
"filename": "OpenSourceInfoscreen.jpg" "filename": "OpenSourceInfoscreen.jpg",
"enddate": "18.11.2016"
} }
] ]
} }
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
"enddate": "30.11.2016" "enddate": "30.11.2016"
}, },
{ {
"filename": "OpenSourceInfoscreen.jpg" "filename": "OpenSourceInfoscreen.jpg",
"enddate": "18.11.2016"
} }
] ]
} }
......
...@@ -12,13 +12,27 @@ var GOLData = { ...@@ -12,13 +12,27 @@ var GOLData = {
}; };
this.loaded=function(panel,config) { this.loaded=function(panel,config) {
console.log("TESTV");
GOLData.panel = panel; GOLData.panel = panel;
console.log("TESTN"+panel);
GOLData.config = config; GOLData.config = config;
GOLinit(); GOLinit();
GOLdraw(); GOLdraw();
setTimeout(function(){setInterval(function() {GOLiterate(); GOLdraw();}, 500); }, 10000); setTimeout(function(){setInterval(function() {GOLiterate(); GOLdraw();}, 500); }, 10000);
} }
this.show=function() {
}
this.resize=function() {
}
this.hide = function() {
}
this.checkShowCondition = function() {
}
function GOLinit(){ function GOLinit(){
//if(GOLData.config[initType] == "random") { //if(GOLData.config[initType] == "random") {
//GOLinitRandom(); //GOLinitRandom();
...@@ -258,8 +272,8 @@ function GOLcountDead(temp,x,y){ ...@@ -258,8 +272,8 @@ function GOLcountDead(temp,x,y){
function GOLinitDraw(){ function GOLinitDraw(){
GOLData.canvas = document.getElementById("GOLCanvas"); GOLData.canvas = document.getElementById("GOLCanvas");
GOLData.context = document.getElementById("GOLCanvas").getContext("2d"); GOLData.context = document.getElementById("GOLCanvas").getContext("2d");
GOLData.canvas.width = panel.width(); GOLData.canvas.width = GOLData.panel.width();
GOLData.canvas.height = panel.height(); GOLData.canvas.height = GOLData.panel.height();
if(GOLData.grid) { if(GOLData.grid) {
GOLData.sWidth = (GOLData.canvas.width-(GOLData.vAmount+1)) / GOLData.vAmount; GOLData.sWidth = (GOLData.canvas.width-(GOLData.vAmount+1)) / GOLData.vAmount;
GOLData.sHeight = (GOLData.canvas.height-(GOLData.hAmount+1)) / GOLData.hAmount; GOLData.sHeight = (GOLData.canvas.height-(GOLData.hAmount+1)) / GOLData.hAmount;
......
...@@ -2,6 +2,7 @@ var nextWerbung=0; ...@@ -2,6 +2,7 @@ var nextWerbung=0;
var werbung_config = null; var werbung_config = null;
var werbung_img_display = null; var werbung_img_display = null;
var werbung_panel = null; var werbung_panel = null;
this.loaded=function(panel,config) { this.loaded=function(panel,config) {
werbung_panel = panel; werbung_panel = panel;
werbung_config = config werbung_config = config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment