Merge branch 'snake'

examples/tsoding_snake/tsoding_snake.h

@@ -0,0 +1,26 @@
+#ifndef TSODING_SNAKE_H_
+#define TSODING_SNAKE_H_
+
+#include <stddef.h>
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+typedef unsigned long long u64;
+typedef int i32;
+typedef int b32;
+typedef float f32;
+
+void platform_fill_rect(i32 x, i32 y, i32 w, i32 h, u32 color);
+void platform_stroke_rect(i32 x, i32 y, i32 w, i32 h, u32 color);
+void platform_fill_text(i32 x, i32 y, const char *text, u32 size, u32 color);
+u32 platform_text_width(const char *text, u32 size);
+void platform_panic(const char *file_path, i32 line, const char *message);
+void platform_log(const char *message);
+
+void game_init(u32 width, u32 height);
+void game_resize(u32 width, u32 height);
+void game_render(void);
+void game_update(f32 dt);
+void game_keydown(int key);
+
+#endif // TSODING_SNAKE_H_

fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2021 The Anek Project Authors (https://github.com/EkType/Anek)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

index.html

@@ -67,7 +67,7 @@
     <canvas id="game"></canvas>
     <script>
         const wasmPaths = {
-            "tsoding": ["game",],
+            "tsoding": ["tsoding_ball","tsoding_snake",],
             "core": ["core_basic_window", "core_basic_screen_manager", "core_input_keys", "core_input_mouse_wheel",],
             "shapes": ["shapes_colors_palette"],
             "text": ["text_writing_anim"],

raylib.js

@@ -11,6 +11,16 @@ function make_environment(env) {
     });
 }
 
+let iota = 0;
+const LOG_ALL     = iota++; // Display all logs
+const LOG_TRACE   = iota++; // Trace logging, intended for internal use only
+const LOG_DEBUG   = iota++; // Debug logging, used for internal debugging, it should be disabled on release builds
+const LOG_INFO    = iota++; // Info logging, used for program execution info
+const LOG_WARNING = iota++; // Warning logging, used on recoverable failures
+const LOG_ERROR   = iota++; // Error logging, used on unrecoverable failures
+const LOG_FATAL   = iota++; // Fatal logging, used to abort program: exit(EXIT_FAILURE)
+const LOG_NONE    = iota++; // Disable logging
+
 class RaylibJs {
     // TODO: We stole the font from the website
     // (https://raylib.com/) and it's slightly different than
@@ -192,6 +202,22 @@ class RaylibJs {
         return args[0];
     }
 
+    TraceLog(logLevel, text_ptr, ... args) {
+        // TODO: Implement printf style formatting for TraceLog
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const text = cstr_by_ptr(buffer, text_ptr);
+        switch(logLevel) {
+        case LOG_ALL:     console.log(`ALL: ${text} ${args}`);     break;
+        case LOG_TRACE:   console.log(`TRACE: ${text} ${args}`);   break;
+        case LOG_DEBUG:   console.log(`DEBUG: ${text} ${args}`);   break;
+        case LOG_INFO:    console.log(`INFO: ${text} ${args}`);    break;
+        case LOG_WARNING: console.log(`WARNING: ${text} ${args}`); break;
+        case LOG_ERROR:   console.log(`ERROR: ${text} ${args}`);   break;
+        case LOG_FATAL:   throw new Error(`FATAL: ${text}`);
+        case LOG_NONE:    console.log(`NONE: ${text} ${args}`);    break;
+        }
+    }
+
     GetMousePosition(result_ptr) {
         const bcrect = this.ctx.canvas.getBoundingClientRect();
         const x = this.currentMousePosition.x - bcrect.left;
@@ -284,6 +310,40 @@ class RaylibJs {
         this.ctx.drawImage(this.images[id], posX, posY);
     }
 
+    // TODO: codepoints are not implemented
+    LoadFontEx(result_ptr, fileName_ptr/*, fontSize, codepoints, codepointCount*/) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const fileName = cstr_by_ptr(buffer, fileName_ptr);
+        // TODO: dynamically generate the name for the font
+        // Support more than one custom font
+        const font = new FontFace("myfont", `url(${fileName})`);
+        document.fonts.add(font);
+        font.load();
+    }
+
+    GenTextureMipmaps() {}
+    SetTextureFilter() {}
+
+    MeasureTextEx(result_ptr, font, text_ptr, fontSize, spacing) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const text = cstr_by_ptr(buffer, text_ptr);
+        const result = new Float32Array(buffer, result_ptr, 2);
+        this.ctx.font = fontSize+"px myfont";
+        const metrics = this.ctx.measureText(text)
+        result[0] = metrics.width;
+        result[1] = fontSize;
+    }
+
+    DrawTextEx(font, text_ptr, position_ptr, fontSize, spacing, tint_ptr) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const text = cstr_by_ptr(buffer, text_ptr);
+        const [posX, posY] = new Float32Array(buffer, position_ptr, 2);
+        const tint = getColorFromMemory(buffer, tint_ptr);
+        this.ctx.fillStyle = tint;
+        this.ctx.font = fontSize+"px myfont";
+        this.ctx.fillText(text, posX, posY + fontSize);
+    }
+
     raylib_js_set_entry(entry) {
         this.entryFunction = this.wasm.instance.exports.__indirect_function_table.get(entry);
     }