BlueGit

blue-star speeltuin

framework update for new animation stuff

timfa Tim · pushed by timfa

Authored 2022-10-18 · 4 years ago

Hash
e20488be0bb8ae4770824113ab9e1d93c0f3f370
Parent
8a6b1f4c
2 files changed +44 −21
build/framework.js +25 −3
@@ -48,7 +48,7 @@ class Game
48 48
49 49 promises.push(new Promise(resolve => {
50 50 var img = new Image();
51 var imageContext = {name: imageData.name, subImgTotal: imageData.subImgTotal, perRow: imageData.perRow};
51 var imageContext = {name: imageData.name, subImgTotal: imageData.subImgTotal, perRow: imageData.perRow, loop: imageData.loop, chain: imageData.chain};
52 52
53 53 img.onload = function() {
54 54
@@ -160,12 +160,14 @@ class GameObject
160 160 class image{
161 161 subImages = null;
162 162 subImagesPerRow = null;
163 loop = false;
164 chain = null;
163 165
164 166 g_image = null;
165 167
166 168 animationCycles = {};
167 169
168 constructor(image, subImgTotal = 1, perRow = 1)
170 constructor(image, subImgTotal = 1, perRow = 1, loop = false, chain = null)
169 171 {
170 172 subImgTotal = subImgTotal || 1;
171 173 perRow = perRow || 1;
@@ -173,6 +175,8 @@ class image{
173 175 this.subImages = subImgTotal;
174 176 this.subImagesPerRow = perRow;
175 177 this.g_image = image;
178 this.loop = loop;
179 this.chain = chain;
176 180
177 181 image.id="loadedImage";
178 182 document.body.append(image);
@@ -403,7 +407,25 @@ class Renderer
403 407 {
404 408 this.cycle.timer -= this.cycle.cycleSpeed;
405 409
406 let next = (this.cycle.current + 1) % this.cycle.cycleArray.length;
410 if(this.cycle.loop)
411 {
412 let next = (this.cycle.current + 1) % this.cycle.cycleArray.length;
413 }
414 else
415 {
416 if(this.cycle.current + 1 > this.cycle.cycleArray.length)
417 {
418 if(this.cycle.chain)
419 {
420 this.setAnimation(this.cycle.chain, this.cycle.chainDefaultIndex, this.cycle.chainSpeed);
421 return;
422 }
423 }
424 else
425 {
426 this.cycle.current ++;
427 }
428 }
407 429 this.updateCycleSprite(next)
408 430 }
409 431 }
@@ -48,7 +48,7 @@ class Game
48
48
49 promises.push(new Promise(resolve => {
49 promises.push(new Promise(resolve => {
50 var img = new Image();
50 var img = new Image();
51 var imageContext = {name: imageData.name, subImgTotal: imageData.subImgTotal, perRow: imageData.perRow};
51 var imageContext = {name: imageData.name, subImgTotal: imageData.subImgTotal, perRow: imageData.perRow, loop: imageData.loop, chain: imageData.chain};
52
52
53 img.onload = function() {
53 img.onload = function() {
54
54
@@ -160,12 +160,14 @@ class GameObject
160class image{
160class image{
161 subImages = null;
161 subImages = null;
162 subImagesPerRow = null;
162 subImagesPerRow = null;
163 loop = false;
164 chain = null;
163
165
164 g_image = null;
166 g_image = null;
165
167
166 animationCycles = {};
168 animationCycles = {};
167
169
168 constructor(image, subImgTotal = 1, perRow = 1)
170 constructor(image, subImgTotal = 1, perRow = 1, loop = false, chain = null)
169 {
171 {
170 subImgTotal = subImgTotal || 1;
172 subImgTotal = subImgTotal || 1;
171 perRow = perRow || 1;
173 perRow = perRow || 1;
@@ -173,6 +175,8 @@ class image{
173 this.subImages = subImgTotal;
175 this.subImages = subImgTotal;
174 this.subImagesPerRow = perRow;
176 this.subImagesPerRow = perRow;
175 this.g_image = image;
177 this.g_image = image;
178 this.loop = loop;
179 this.chain = chain;
176
180
177 image.id="loadedImage";
181 image.id="loadedImage";
178 document.body.append(image);
182 document.body.append(image);
@@ -403,7 +407,25 @@ class Renderer
403 {
407 {
404 this.cycle.timer -= this.cycle.cycleSpeed;
408 this.cycle.timer -= this.cycle.cycleSpeed;
405
409
406 let next = (this.cycle.current + 1) % this.cycle.cycleArray.length;
410 if(this.cycle.loop)
411 {
412 let next = (this.cycle.current + 1) % this.cycle.cycleArray.length;
413 }
414 else
415 {
416 if(this.cycle.current + 1 > this.cycle.cycleArray.length)
417 {
418 if(this.cycle.chain)
419 {
420 this.setAnimation(this.cycle.chain, this.cycle.chainDefaultIndex, this.cycle.chainSpeed);
421 return;
422 }
423 }
424 else
425 {
426 this.cycle.current ++;
427 }
428 }
407 this.updateCycleSprite(next)
429 this.updateCycleSprite(next)
408 }
430 }
409 }
431 }
src/game.js +19 −18
@@ -50,17 +50,17 @@ window.onload = function()
50 50
51 51 function setupChaoAnimations(image)
52 52 {
53 image.addAnimationCycle("walkDown", [0, 1, 0, 2])
54 image.addAnimationCycle("walkLeft", [3, 4, 3, 5])
55 image.addAnimationCycle("walkUp", [6, 7, 6, 8])
53 image.addAnimationCycle("walkDown", [0, 1, 0, 2], true)
54 image.addAnimationCycle("walkLeft", [3, 4, 3, 5], true)
55 image.addAnimationCycle("walkUp", [6, 7, 6, 8], true)
56 56
57 57 image.addAnimationCycle("standDown", [0])
58 58 image.addAnimationCycle("standLeft", [3])
59 59 image.addAnimationCycle("standUp", [6])
60 60
61 image.addAnimationCycle("flyDown", [9, 10, 11, 10])
62 image.addAnimationCycle("flyLeft", [12, 13, 14, 13])
63 image.addAnimationCycle("flyUp", [15, 16, 17, 16])
61 image.addAnimationCycle("flyDown", [9, 10, 11, 10], true)
62 image.addAnimationCycle("flyLeft", [12, 13, 14, 13], true)
63 image.addAnimationCycle("flyUp", [15, 16, 17, 16], true)
64 64
65 65 image.addAnimationCycle("tripDown", [18, 19, 20])
66 66 image.addAnimationCycle("tripLeft", [21, 22, 23])
@@ -69,26 +69,27 @@ function setupChaoAnimations(image)
69 69 image.addAnimationCycle("sitDown", [27])
70 70 image.addAnimationCycle("sitLeft", [28])
71 71
72 image.addAnimationCycle("tantrum", [29, 30, 29, 31, 32, 33])
72 image.addAnimationCycle("tantrum", [29, 30, 29, 31, 32, 33], true)
73 73
74 image.addAnimationCycle("swimStruggle", [34, 35])
75 image.addAnimationCycle("beginSit", [36, 37, 38])
74 image.addAnimationCycle("swimStruggle", [34, 35], true)
75 image.addAnimationCycle("eatStart", [36, 37, 38], false, "eat")
76 image.addAnimationCycle("eat", [37, 38], false, "eat")
76 77
77 image.addAnimationCycle("cheer", [39, 40])
78 image.addAnimationCycle("cheer", [39, 40], true)
78 79 image.addAnimationCycle("wave", [41, 42])
79 80
80 image.addAnimationCycle("hungry", [43, 44])
81 image.addAnimationCycle("hungry", [43, 44], true)
81 82
82 image.addAnimationCycle("no", [45, 46, 45, 47])
83 image.addAnimationCycle("no", [45, 46, 45, 47], true)
83 84 image.addAnimationCycle("think", [48])
84 image.addAnimationCycle("happy", [49, 50, 49, 51])
85 image.addAnimationCycle("happy", [49, 50, 49, 51], true)
85 86 image.addAnimationCycle("sad", [52])
86 image.addAnimationCycle("sleep", [53, 54])
87 image.addAnimationCycle("sleep", [53, 54], true)
87 88
88 image.addAnimationCycle("swim", [55, 56, 57])
89 image.addAnimationCycle("sitHappy", [58, 59])
90 image.addAnimationCycle("sneeze", [60, 61, 62, 63])
91 image.addAnimationCycle("cry", [64, 65])
89 image.addAnimationCycle("swim", [55, 56, 57], true)
90 image.addAnimationCycle("eatBig", [58, 59])
91 image.addAnimationCycle("sneeze", [60, 61, 62, 63], false, "standDown")
92 image.addAnimationCycle("cry", [64, 65], true)
92 93 image.addAnimationCycle("think2", [66])
93 94 }
94 95
@@ -50,17 +50,17 @@ window.onload = function()
50
50
51function setupChaoAnimations(image)
51function setupChaoAnimations(image)
52{
52{
53 image.addAnimationCycle("walkDown", [0, 1, 0, 2])
53 image.addAnimationCycle("walkDown", [0, 1, 0, 2], true)
54 image.addAnimationCycle("walkLeft", [3, 4, 3, 5])
54 image.addAnimationCycle("walkLeft", [3, 4, 3, 5], true)
55 image.addAnimationCycle("walkUp", [6, 7, 6, 8])
55 image.addAnimationCycle("walkUp", [6, 7, 6, 8], true)
56
56
57 image.addAnimationCycle("standDown", [0])
57 image.addAnimationCycle("standDown", [0])
58 image.addAnimationCycle("standLeft", [3])
58 image.addAnimationCycle("standLeft", [3])
59 image.addAnimationCycle("standUp", [6])
59 image.addAnimationCycle("standUp", [6])
60
60
61 image.addAnimationCycle("flyDown", [9, 10, 11, 10])
61 image.addAnimationCycle("flyDown", [9, 10, 11, 10], true)
62 image.addAnimationCycle("flyLeft", [12, 13, 14, 13])
62 image.addAnimationCycle("flyLeft", [12, 13, 14, 13], true)
63 image.addAnimationCycle("flyUp", [15, 16, 17, 16])
63 image.addAnimationCycle("flyUp", [15, 16, 17, 16], true)
64
64
65 image.addAnimationCycle("tripDown", [18, 19, 20])
65 image.addAnimationCycle("tripDown", [18, 19, 20])
66 image.addAnimationCycle("tripLeft", [21, 22, 23])
66 image.addAnimationCycle("tripLeft", [21, 22, 23])
@@ -69,26 +69,27 @@ function setupChaoAnimations(image)
69 image.addAnimationCycle("sitDown", [27])
69 image.addAnimationCycle("sitDown", [27])
70 image.addAnimationCycle("sitLeft", [28])
70 image.addAnimationCycle("sitLeft", [28])
71
71
72 image.addAnimationCycle("tantrum", [29, 30, 29, 31, 32, 33])
72 image.addAnimationCycle("tantrum", [29, 30, 29, 31, 32, 33], true)
73
73
74 image.addAnimationCycle("swimStruggle", [34, 35])
74 image.addAnimationCycle("swimStruggle", [34, 35], true)
75 image.addAnimationCycle("beginSit", [36, 37, 38])
75 image.addAnimationCycle("eatStart", [36, 37, 38], false, "eat")
76 image.addAnimationCycle("eat", [37, 38], false, "eat")
76
77
77 image.addAnimationCycle("cheer", [39, 40])
78 image.addAnimationCycle("cheer", [39, 40], true)
78 image.addAnimationCycle("wave", [41, 42])
79 image.addAnimationCycle("wave", [41, 42])
79
80
80 image.addAnimationCycle("hungry", [43, 44])
81 image.addAnimationCycle("hungry", [43, 44], true)
81
82
82 image.addAnimationCycle("no", [45, 46, 45, 47])
83 image.addAnimationCycle("no", [45, 46, 45, 47], true)
83 image.addAnimationCycle("think", [48])
84 image.addAnimationCycle("think", [48])
84 image.addAnimationCycle("happy", [49, 50, 49, 51])
85 image.addAnimationCycle("happy", [49, 50, 49, 51], true)
85 image.addAnimationCycle("sad", [52])
86 image.addAnimationCycle("sad", [52])
86 image.addAnimationCycle("sleep", [53, 54])
87 image.addAnimationCycle("sleep", [53, 54], true)
87
88
88 image.addAnimationCycle("swim", [55, 56, 57])
89 image.addAnimationCycle("swim", [55, 56, 57], true)
89 image.addAnimationCycle("sitHappy", [58, 59])
90 image.addAnimationCycle("eatBig", [58, 59])
90 image.addAnimationCycle("sneeze", [60, 61, 62, 63])
91 image.addAnimationCycle("sneeze", [60, 61, 62, 63], false, "standDown")
91 image.addAnimationCycle("cry", [64, 65])
92 image.addAnimationCycle("cry", [64, 65], true)
92 image.addAnimationCycle("think2", [66])
93 image.addAnimationCycle("think2", [66])
93}
94}
94
95