glad

Source/Instruments/Trojka/trojka.c

@@ -15,8 +15,9 @@
 struct stfu_trojka {
   struct stfu_phaser phasers[STFU_TROJKA_OP_COUNT];
   struct stfu_envelope envelopes[STFU_TROJKA_OP_COUNT];
-  float gains[STFU_TROJKA_OP_COUNT];
+  float gains[STFU_TROJKA_OP_COUNT]; // todo: Combine with indices?
   float freq_scales[STFU_TROJKA_OP_COUNT];
+  float indices[STFU_TROJKA_OP_COUNT - 1]; /* 1 to 100 */
   float key_frequency;
   float feedback_gain; // todo: Separate gain for channels?
   float left_feedback, right_feedback;
@@ -28,8 +29,8 @@ static struct stfu_trojka stfu_sample_trojka(struct stfu_trojka synth, float buf
     synth.envelopes[i] = stfu_pump_envelope(synth.envelopes[i]);
   }
 
-  float left_modulator_stack = synth.envelopes[1].v * sinf(synth.phasers[1].v + synth.envelopes[0].v * sinf(synth.phasers[0].v)) + synth.left_feedback * synth.feedback_gain;
+  float left_modulator_stack = synth.envelopes[1].v * synth.indices[1] * sinf(synth.phasers[1].v + synth.envelopes[0].v * synth.indices[0] * sinf(synth.phasers[0].v)) + synth.left_feedback * synth.feedback_gain;
-  float right_modulator_stack = synth.envelopes[1].v * sinf(synth.phasers[1].v + synth.envelopes[0].v * sinf(synth.phasers[0].v)) + synth.right_feedback * synth.feedback_gain;
+  float right_modulator_stack = left_modulator_stack;
 
   synth.left_feedback = left_modulator_stack;
   synth.right_feedback = right_modulator_stack;

Source/Maker/Build/windows-clang.bat

@@ -1 +1 @@
-clang ../main.c -lkernel32 -luser32 -lshell32 -ld3d11 -ldxgi -lgdi32 -lole32 -DSOKOL_D3D11 -o stfu-maker.exe -O3
+clang ../main.c -lkernel32 -luser32 -lshell32 -lopengl32 -lgdi32 -lole32 -DSOKOL_GLCORE -o stfu-maker.exe -O3

Source/Maker/glad/include/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

Source/Maker/main.c

@@ -7,6 +7,8 @@
 #include "sokol_audio.h"
 #include "sokol_log.h"
 
+#include "glad/src/glad.c"
+
 #define STFU_MAIN
 #include "../config.h"
 #include "../envelope.c"
@@ -24,6 +26,9 @@ static float crossfade_ring[CROSSFADE_RING_RANGE] = {0};
 static size_t crossfade_ring_needle = 0;
 static unsigned int crossfade_frames_left = 0;
 
+// 1.0 is with A at 440
+static float octave = 0.5;
+
 static void stream(float *buffer, int num_frames, int num_channels) {
   /* Fade away */
   for (size_t i = 0; crossfade_frames_left > 0;
@@ -47,16 +52,23 @@ static void stream(float *buffer, int num_frames, int num_channels) {
 }
 
 static void init(void) {
+  gladLoadGL();
+
   saudio_setup(&(saudio_desc){
       .sample_rate = STFU_AUDIO_FRAME_RATE,
       .num_channels = STFU_AUDIO_CHANNEL_COUNT,
       // .stream_cb = stream,
   });
 
-  synth.phasers[0] = stfu_init_phaser(220);
+  synth.freq_scales[0] = 1.0;
-  synth.phasers[1] = stfu_init_phaser(220 * 0.25);
+  synth.freq_scales[1] = 0.25;
-  synth.phasers[2] = stfu_init_phaser(220 * 2.0);
+  synth.freq_scales[2] = 2.0;
+
+  synth.indices[0] = 2.0;
+  synth.indices[1] = 10.0;
+
   synth.feedback_gain = 0.25;
+
   for (int i = 0; i < STFU_TROJKA_OP_COUNT; ++i) {
     synth.envelopes[i] = stfu_init_envelope(
         (struct stfu_envelope_point[]){[0] = {.dur = 0.02, .vol = 1.0},
@@ -64,7 +76,6 @@ static void init(void) {
                                        [2] = {.dur = 1.0, .vol = 0}},
         3);
     synth.gains[i] = 1.0;
-    synth.freq_scales[i] = 1.0;
   }
 }
 
@@ -76,40 +87,103 @@ static void event(const sapp_event *e) {
     if (e->key_repeat)
       break;
 
+    bool key_was_pressed = false;
+
     switch (e->key_code) {
     case SAPP_KEYCODE_Z:
-      synth = stfu_press_trojka(synth, STFU_SCALE[0]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[0] * octave);
+      break;
     case SAPP_KEYCODE_X:
-      synth = stfu_press_trojka(synth, STFU_SCALE[1]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[1] * octave);
       break;
     case SAPP_KEYCODE_C:
-      synth = stfu_press_trojka(synth, STFU_SCALE[2]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[2] * octave);
       break;
     case SAPP_KEYCODE_V:
-      synth = stfu_press_trojka(synth, STFU_SCALE[3]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[3] * octave);
       break;
     case SAPP_KEYCODE_B:
-      synth = stfu_press_trojka(synth, STFU_SCALE[4]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[4] * octave);
       break;
     case SAPP_KEYCODE_N:
-      synth = stfu_press_trojka(synth, STFU_SCALE[5]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[5] * octave);
       break;
     case SAPP_KEYCODE_M:
-      synth = stfu_press_trojka(synth, STFU_SCALE[6]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[6] * octave);
       break;
     case SAPP_KEYCODE_COMMA:
-      synth = stfu_press_trojka(synth, STFU_SCALE[7]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[7] * octave);
       break;
     case SAPP_KEYCODE_PERIOD:
-      synth = stfu_press_trojka(synth, STFU_SCALE[8]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[8] * octave);
       break;
     case SAPP_KEYCODE_SLASH:
-      synth = stfu_press_trojka(synth, STFU_SCALE[9]);
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[9] * octave);
       break;
+
+    case SAPP_KEYCODE_A:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[0] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_S:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[1] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_D:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[2] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_F:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[3] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_G:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[4] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_H:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[5] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_J:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[6] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_K:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[7] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_L:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[8] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_SEMICOLON:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[9] * (octave * 2));
+      break;
+    case SAPP_KEYCODE_APOSTROPHE:
+      key_was_pressed = true;
+      synth = stfu_press_trojka(synth, STFU_SCALE[10] * (octave * 2));
+      break;
+
     default:
       break;
     }
 
+    if (key_was_pressed) {
+      crossfade_frames_left = STFU_CROSSFADE_BUFFER_FRAMES;
+    }
+
     break;
   }
   default:
@@ -140,8 +214,8 @@ sapp_desc sokol_main(int argc, char *argv[]) {
       .cleanup_cb = cleanup,
       .event_cb = event,
       .logger.func = slog_func,
-      .gl_major_version = 2,
+      // .gl_major_version = 2,
-      .gl_minor_version = 0,
+      // .gl_minor_version = 0,
       // .swap_interval = 0,
       .window_title = "stfu-maker",
   };

Source/config.h

@@ -33,6 +33,8 @@ static const float STFU_SCALE[12] = {
                   STFU_NOTE_DOWNSCALE_FACTOR,
   STFU_A4_FREQUENCY * STFU_NOTE_DOWNSCALE_FACTOR,
   STFU_A4_FREQUENCY,
+  STFU_A4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR,
+  STFU_A4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR * STFU_NOTE_UPSCALE_FACTOR,
 };
 
 #endif

readme.md

@@ -1,5 +1,5 @@
 # STFU ! SoundTracker Format Unirepo
-Grassroot music format specifically designed for lofi game soundtracks with accent on binary efficiency in its various forms.
+Grassroot music format specifically designed for reproducible lofi game soundtracks with accent on binary efficiency in its various forms.
 
 - Separation of Maker and Player binaries, with Player being absolutely dependency free.
 - Samples and instruments are stored outside of tracks in a shared data base allowing reuse.