|
1 |
| -const VERSION = "3000.1.15" |
| 1 | +const VERSION = "3000.1.16" |
2 | 2 |
|
3 | 3 | import initApp from "./app"
|
4 | 4 | import initGfx, {
|
@@ -423,7 +423,7 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
423 | 423 |
|
424 | 424 | const gc: Array<() => void> = []
|
425 | 425 |
|
426 |
| - const gl = app.canvas() |
| 426 | + const gl = app.canvas |
427 | 427 | .getContext("webgl", {
|
428 | 428 | antialias: true,
|
429 | 429 | depth: true,
|
@@ -1035,28 +1035,28 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
1035 | 1035 | return loadSprite(name, beanSpriteSrc)
|
1036 | 1036 | }
|
1037 | 1037 |
|
1038 |
| - function getSprite(handle: string): Asset<SpriteData> | void { |
1039 |
| - return assets.sprites.get(handle) |
| 1038 | + function getSprite(name: string): Asset<SpriteData> | void { |
| 1039 | + return assets.sprites.get(name) |
1040 | 1040 | }
|
1041 | 1041 |
|
1042 |
| - function getSound(handle: string): Asset<SoundData> | void { |
1043 |
| - return assets.sounds.get(handle) |
| 1042 | + function getSound(name: string): Asset<SoundData> | void { |
| 1043 | + return assets.sounds.get(name) |
1044 | 1044 | }
|
1045 | 1045 |
|
1046 |
| - function getFont(handle: string): Asset<FontData> | void { |
1047 |
| - return assets.fonts.get(handle) |
| 1046 | + function getFont(name: string): Asset<FontData> | void { |
| 1047 | + return assets.fonts.get(name) |
1048 | 1048 | }
|
1049 | 1049 |
|
1050 |
| - function getBitmapFont(handle: string): Asset<BitmapFontData> | void { |
1051 |
| - return assets.bitmapFonts.get(handle) |
| 1050 | + function getBitmapFont(name: string): Asset<BitmapFontData> | void { |
| 1051 | + return assets.bitmapFonts.get(name) |
1052 | 1052 | }
|
1053 | 1053 |
|
1054 |
| - function getShader(handle: string): Asset<ShaderData> | void { |
1055 |
| - return assets.shaders.get(handle) |
| 1054 | + function getShader(name: string): Asset<ShaderData> | void { |
| 1055 | + return assets.shaders.get(name) |
1056 | 1056 | }
|
1057 | 1057 |
|
1058 |
| - function getAsset(handle: string): Asset<any> | void { |
1059 |
| - return assets.custom.get(handle) |
| 1058 | + function getAsset(name: string): Asset<any> | void { |
| 1059 | + return assets.custom.get(name) |
1060 | 1060 | }
|
1061 | 1061 |
|
1062 | 1062 | function resolveSprite(
|
@@ -5426,7 +5426,7 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
5426 | 5426 |
|
5427 | 5427 | function record(frameRate?): Recording {
|
5428 | 5428 |
|
5429 |
| - const stream = app.canvas().captureStream(frameRate) |
| 5429 | + const stream = app.canvas.captureStream(frameRate) |
5430 | 5430 | const audioDest = audio.ctx.createMediaStreamDestination()
|
5431 | 5431 |
|
5432 | 5432 | audio.masterNode.connect(audioDest)
|
@@ -5486,7 +5486,7 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
5486 | 5486 | }
|
5487 | 5487 |
|
5488 | 5488 | function isFocused(): boolean {
|
5489 |
| - return document.activeElement === app.canvas() |
| 5489 | + return document.activeElement === app.canvas |
5490 | 5490 | }
|
5491 | 5491 |
|
5492 | 5492 | function destroy(obj: GameObj) {
|
@@ -6013,11 +6013,15 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
6013 | 6013 |
|
6014 | 6014 | function handleErr(err: Error) {
|
6015 | 6015 |
|
| 6016 | + console.error(err) |
| 6017 | + |
6016 | 6018 | audio.ctx.suspend()
|
6017 | 6019 |
|
6018 | 6020 | // TODO: this should only run once
|
6019 | 6021 | app.run(() => {
|
6020 | 6022 |
|
| 6023 | + frameStart() |
| 6024 | + |
6021 | 6025 | drawUnscaled(() => {
|
6022 | 6026 |
|
6023 | 6027 | const pad = 32
|
@@ -6063,6 +6067,8 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
6063 | 6067 |
|
6064 | 6068 | })
|
6065 | 6069 |
|
| 6070 | + frameEnd() |
| 6071 | + |
6066 | 6072 | })
|
6067 | 6073 |
|
6068 | 6074 | }
|
@@ -6489,7 +6495,7 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
6489 | 6495 | // char sets
|
6490 | 6496 | ASCII_CHARS,
|
6491 | 6497 | // dom
|
6492 |
| - canvas: app.canvas(), |
| 6498 | + canvas: app.canvas, |
6493 | 6499 | // misc
|
6494 | 6500 | addKaboom,
|
6495 | 6501 | // dirs
|
@@ -6525,7 +6531,7 @@ export default (gopt: KaboomOpt = {}): KaboomCtx => {
|
6525 | 6531 | }
|
6526 | 6532 |
|
6527 | 6533 | if (gopt.focus !== false) {
|
6528 |
| - app.canvas().focus() |
| 6534 | + app.canvas.focus() |
6529 | 6535 | }
|
6530 | 6536 |
|
6531 | 6537 | return ctx
|
|
0 commit comments