expose audio to twnlua

apps/demos/scenery/scenes/ingame.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 
-#define TERRAIN_FREQUENCY 0.1f
+#define TERRAIN_FREQUENCY 0.15f
 #define TERRAIN_DISTANCE 32
 #define HALF_TERRAIN_DISTANCE ((float)TERRAIN_DISTANCE / 2)
 #define PLAYER_HEIGHT 0.6f
@@ -135,6 +135,7 @@ static void generate_terrain(SceneIngame *scn) {
             float y = floorf(scn->pos.z - HALF_TERRAIN_DISTANCE + (float)ly);
 
             float height = stb_perlin_noise3((float)x * TERRAIN_FREQUENCY, (float)y * TERRAIN_FREQUENCY, 0, 0, 0, 0) * 3 - 1;
+            height += stb_perlin_noise3((float)x * TERRAIN_FREQUENCY / 10, (float)y * TERRAIN_FREQUENCY / 10, 0, 0, 0, 0) * 10 - 1;
 
             heightmap[lx][ly] = height;
         }

apps/twnlua/bindgen.py

@@ -34,7 +34,7 @@ def default(parameter):
 def to_table(typedesc, variable, indent = 0):
     binding = ' ' * indent + "lua_createtable(L, 0, %i);\n" % len(typedesc["fields"])
     for field in typedesc["fields"]:
-        if field["type"] == "float":
+        if field["type"] == "float" or field["type"] == "uint8_t":
             binding += ' ' * indent + "lua_pushnumber(L, (double)(%s));\n" % (variable + ".%s" % field["name"])
         elif field["type"] == "bool":
             binding += ' ' * indent + "lua_pushboolean(L, (%s));\n" % (variable + ".%s" % field["name"])
@@ -50,8 +50,8 @@ def from_table(typedesc, variable, indent = 0):
     binding = ""
     for field in typedesc["fields"]:
         binding += ' ' * indent + "lua_getfield(L, -1, \"%s\");\n" % field["name"]
-        if field["type"] == "float":
-            binding += ' ' * indent + "%s = (float)lua_tonumber(L, -1);\n" % (variable + ".%s" % field["name"])
+        if field["type"] == "float" or field["type"] == "uint8_t":
+            binding += ' ' * indent + "%s = (%s)lua_tonumber(L, -1);\n" % (variable + ".%s" % field["name"], field["type"])
         elif field["type"] == "bool":
             binding += ' ' * indent + "%s = lua_toboolean(L, -1);\n" % (variable + ".%s" % field["name"])
         elif field["type"] in api["types"]:

include/twn_audio.h

@@ -9,7 +9,7 @@
 /* plays audio file at specified channel or at scratch channel if NULL is passed, without ability to refer to it later */
 /* path path must contain valid file extension to infer which file format it is */
 /* supported formats: .ogg, .xm */
-TWN_API void audio_play(const char *path,
+TWN_API void audio_play(const char *audio,
                         const char *channel,    /* optional */
                         bool  repeat,           /* default: false */
                         float volume,           /* default: 1.0f, range: 0.0f to 1.0f */

share/twn_api.json

@@ -213,6 +213,30 @@
                 { "name": "textures", "type": "char *", "default": {} }
             ]
         },
+
+        "audio_play": {
+            "module": "audio",
+            "symbol": "play",
+            "header": "twn_audio.h",
+            "params": [
+                { "name": "audio", "type": "char *" },
+                { "name": "channel", "type": "char *", "default": {} },
+                { "name": "repeat", "type": "bool", "default": false },
+                { "name": "volume", "type": "float", "default": 1.0 },
+                { "name": "panning", "type": "float", "default": 0.0 }
+            ]
+        },
+
+        "audio_parameter": {
+            "module": "audio",
+            "symbol": "parameter",
+            "header": "twn_audio.h",
+            "params": [
+                { "name": "channel", "type": "char *" },
+                { "name": "parameter", "type": "char *" },
+                { "name": "value", "type": "float" }
+            ]
+        }
     },
 
     "types": {

src/twn_engine_context_c.h

@@ -72,11 +72,6 @@ typedef struct EngineContext {
     SDL_Window *window;
     uint32_t window_id;
 
-    /* this should be a multiple of the current ticks per second */
-    /* use it to simulate low framerate (e.g. at 60 tps, set to 2 for 30 fps) */
-    /* it can be changed at runtime; any resulting logic anomalies are bugs */
-    uint32_t update_multiplicity;
-
     bool is_running;
     bool window_size_has_changed;
     bool resync_flag;

src/twn_input.c

@@ -216,11 +216,14 @@ void input_state_deinit(InputState *input) {
 }
 
 
-void input_state_update(InputState *input) {
+void input_state_update_postframe(InputState *input) {
     /* TODO: don't spam it if it happens */
     if (SDL_SetRelativeMouseMode(ctx.game_copy.mouse_capture && ctx.window_mouse_resident) != 0)
         log_warn("(%s) Mouse capture isn't supported.", __func__);
+}
 
+
+void input_state_update(InputState *input) {
     int x, y;
 
     input->keyboard_state = SDL_GetKeyboardState(NULL);

src/twn_input_c.h

@@ -76,6 +76,8 @@ void input_state_deinit(InputState *input);
 
 void input_state_update(InputState *input);
 
+void input_state_update_postframe(InputState *input);
+
 void input_reset_state(InputState *input);
 
 #endif

src/twn_loop.c

@@ -204,22 +204,25 @@ static void main_loop(void) {
 
     /* finally, let's get to work */
     int frames = 0;
-    while (ctx.frame_accumulator >= ctx.desired_frametime * ctx.update_multiplicity) {
+    while (ctx.frame_accumulator >= ctx.desired_frametime) {
         frames += 1;
-        for (size_t i = 0; i < ctx.update_multiplicity; ++i) {
         /* TODO: disable rendering pushes on not-last ? */
         render_queue_clear();
         poll_events();
         if (ctx.window_size_has_changed)
             update_viewport();
+        input_state_update(&ctx.input);
         game_object_tick();
+        input_state_update_postframe(&ctx.input);
+
         #ifdef TWN_FEATURE_PUSH_AUDIO
         static uint8_t audio_buffer[(AUDIO_FREQUENCY / 60) * sizeof (float) * 2];
         audio_callback(NULL, audio_buffer, sizeof audio_buffer);
         if (SDL_QueueAudio(ctx.audio_device, audio_buffer, sizeof audio_buffer))
             CRY_SDL("Error queueing audio: ");
         #endif
-            input_state_update(&ctx.input);
+
+        /* TODO: ctx.game_copy = ctx.game should be placed after it, but it messes with state used in render() */
         preserve_persistent_ctx_fields();
 
         ctx.frame_accumulator -= ctx.desired_frametime;
@@ -229,7 +232,6 @@ static void main_loop(void) {
             ctx.game.frame_number = 0;
         ctx.game.initialization_needed = false;
     }
-    }
 
     /* TODO: in some cases machine might want to assume frames will be fed as much as possible */
     /*       which for now is broken as glBufferData with NULL is used all over right after render */
@@ -507,8 +509,8 @@ static bool initialize(void) {
         goto fail;
     }
 
-    if (SDL_GL_SetSwapInterval(-1))
-        SDL_GL_SetSwapInterval(1);
+    /* TODO: figure out what we ultimately prefer */
+    SDL_GL_SetSwapInterval(0);
 
     if (!render_init())
         goto fail;
@@ -552,9 +554,6 @@ static bool initialize(void) {
 
     }
 
-    /* you could change this at runtime if you wanted */
-    ctx.update_multiplicity = 1;
-
     /* random seeding */
     /* SDL_GetPerformanceCounter returns some platform-dependent number. */
     /* it should vary between game instances. i checked! random enough for me. */