v0.8.2: release notes

- add standard sw input joystick
- dengitor now loads current font in preferences
- update gradle plugin
- `-dumpscene` is now an argument for test  scene-ecs

Author: Denzy7

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(dengine VERSION 0.8.1)
+project(dengine VERSION 0.8.2)
 
 #this is just a slight nuance with cmake rather than renaming the project
 set(DENGINE_VERSION "${dengine_VERSION}")

glue/CMakeLists.txt

@@ -17,6 +17,10 @@ set_target_properties(dengine_glue_lib PROPERTIES
     POSITION_INDEPENDENT_CODE ON)
 target_include_directories(dengine_glue_lib PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(dengine_glue_lib PRIVATE dengine-core dengine-utils dengine-gui dengine-script)
+set(dengine_glue_lib_links dengine-core dengine-utils dengine-gui dengine-script)
+if(UNIX)
+    list(APPEND dengine_glue_lib_links m)
+endif()
+target_link_libraries(dengine_glue_lib PRIVATE ${dengine_glue_lib_links})
 
 install(TARGETS dengine_glue_lib DESTINATION lib/dengine-${DENGINE_VERSION})

glue/include/dengine/dengine.h

@@ -72,6 +72,15 @@ typedef struct
 
     int android_handlebackbutton;
 }DengineInitOpts;
+
+
+typedef struct
+{
+    int isdown, snap_x, snap_y;
+    int isregion_ondown;
+}SWInput_Joystick;
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -90,6 +99,26 @@ int dengine_update();
  */
 int dengine_load_asset(const char* path, void** mem, size_t* length);
 
+/*!
+ * \brief software input joystick 
+ * \param x x screen coordinate
+ * \param y y screen coordinate
+ * \param dim width and height of joystick. it must be a square after all
+ * \param snap_lim if > 0, allows the joystick to snap if input is around x and y around the limit region specified
+ * \param clamp a texture for the clamp limiting the handle. usually a hollow circle
+ * \param handle a texture for the handle which user operates. usually a filled circle
+ * \param outx outputs -1 and 1 with how much of the handle has deviated from centre of clamp in x axis
+ * \param outy outputs -1 and 1 with how much of the handle has deviated from centre of clamp in x axis
+ * \param store static private datastore which should be init to 0 with memset
+ */
+void dengine_input_swinput_joystick(
+        int x, int y, int dim, 
+        int snap_lim,
+        Texture* clamp, float* clamp_color_vec4,
+        Texture* handle, float* handle_color_vec4, 
+        float* outx, float* outy,
+        SWInput_Joystick* joystick);
+
 #ifdef __cplusplus
 }
 #endif

glue/src/dengine.c

@@ -406,6 +406,92 @@ int dengine_load_asset(const char* path, void** mem, size_t* length)
     return 1;
 }
 
+void dengine_input_swinput_joystick(
+        int x, int y, int dim, 
+        int snap_lim,
+        Texture* clamp, float* clamp_color_vec4,
+        Texture* handle, float* handle_color_vec4, 
+        float* outx, float* outy,
+        SWInput_Joystick* joystick)
+{
+    float hwinput_x, hwinput_y;
+    vec2 output;
+
+    /* TODO: we use mouse for now. use touches too */
+    joystick->isdown = dengine_input_get_mousebtn(DENGINE_INPUT_MSEBTN_PRIMARY);
+    hwinput_x = dengine_input_get_mousepos_x();
+    hwinput_y = dengine_input_get_mousepos_y();
+
+    int joyx = x;
+    int joyy = y;
+    int joyhanddim = dim / 2;
+    int joyhandx, joyhandy;
+
+    int sqregionoffset = 
+        snap_lim ?
+        snap_lim : dim;
+
+    /*TODO: doesn't consider the center of joystick. the user 
+     * wont notice anyway (0_-), (-_-), (0_-)
+     */
+    int inregion = hwinput_x >= x - sqregionoffset && hwinput_x <= x + sqregionoffset &&
+        hwinput_y >= y - sqregionoffset && hwinput_y <= y + sqregionoffset;
+
+    if(snap_lim)
+    {
+        joyx = hwinput_x - (dim / 2.0f);
+        joyy = hwinput_y - (dim / 2.0f);
+        if(inregion && !joystick->isregion_ondown)
+        {
+            joystick->snap_x = joyx;;
+            joystick->snap_y = joyy;
+            joystick->isregion_ondown = 1;
+        }
+
+        if(joystick->isdown)
+        {
+            joyx = joystick->snap_x;
+            joyy = joystick->snap_y;
+        }
+    }else {
+        if(joystick->isdown && inregion)
+            joystick->isregion_ondown = 1;
+    }
+    
+    if(joystick->isdown && joystick->isregion_ondown){
+        joyhandx = hwinput_x - (joyhanddim / 2.0f);
+        joyhandy = hwinput_y - (joyhanddim / 2.0f);
+        vec2 a = {joyhandx + (joyhanddim / 2.0f), joyhandy + (joyhanddim / 2.0f)}; 
+        vec2 b = {joyx + (dim / 2.0f), joyy + (dim / 2.0f)}; 
+        vec2 c;
+        glm_vec2_sub(a, b, c);
+        float mag = glm_vec2_norm(c);
+        if(mag > dim / 2.0f)
+        {
+            glm_vec2_scale_as(c, dim / 2.0f, c);
+        }
+        joyhandx = joyx + (joyhanddim / 2.0f) + c[0];
+        joyhandy = joyy + (joyhanddim / 2.0f) + c[1];
+        glm_vec2_divs(c, dim / 2.0f, output);
+;
+    }else{
+        joyx = x;
+        joyy = y;
+        joystick->isregion_ondown = 0;
+        joyhandx = joyx + (dim / 2.0f) - (joyhanddim / 2.0f);
+        joyhandy = joyy + (dim / 2.0f) - (joyhanddim / 2.0f);
+        glm_vec2_zero(output);
+    }
+
+    *outx = output[0];
+    *outy = output[1];
+
+    denginegui_set_panel_discard(1);
+    denginegui_panel(joyx, joyy, dim, dim, clamp, NULL, clamp_color_vec4);
+    denginegui_panel(joyhandx, joyhandy, joyhanddim, joyhanddim, handle, NULL, handle_color_vec4);
+    denginegui_set_panel_discard(0);
+}
+
 #ifdef DENGINE_ANDROID
 void backbutton_func(struct android_app* app)
 {

lib/dengine-core/src/window.c

@@ -1479,20 +1479,22 @@ int32_t _dengine_window_android_oninput(struct android_app* app, AInputEvent* ev
                     stdinput->touches[i].y = h - AMotionEvent_getY(event, i);
                 }
 
-                stdinput->mouse_btns[DENGINE_INPUT_MSEBTN_PRIMARY].state = 1;
-                stdinput->mouse_x = stdinput->touches[0].x;
-                stdinput->mouse_y = stdinput->touches[0].y;
                 if(ptrid < DENGINE_ARY_SZ(stdinput->touches)){
                     stdinput->touches[ptrid].isdown = 1;
                     if(state == AMOTION_EVENT_ACTION_UP || state == AMOTION_EVENT_ACTION_POINTER_UP){
-                        stdinput->mouse_btns[DENGINE_INPUT_MSEBTN_PRIMARY].state = 0;
                         stdinput->touches[ptrid].isdown = 0;
                         stdinput->touches[ptrid].oneshot = 0;
                     }
                 }
+
+                /*TODO: touch 0 is very naive as  other touches could be down when its 0*/
+                stdinput->mouse_x = stdinput->touches[0].x;
+                stdinput->mouse_y = stdinput->touches[0].y;
+                stdinput->mouse_btns[DENGINE_INPUT_MSEBTN_PRIMARY].state = stdinput->touches[0].isdown;
 
 
-                /*for(size_t i = 0; i < DENGINE_ARY_SZ(stdinput->touches); i++)*/
+
+/*                for(size_t i = 0; i < DENGINE_ARY_SZ(stdinput->touches); i++)*/
                 /*{*/
                     /*dengineutils_logging_log("%f %f %d %d",*/
                             /*stdinput->touches[i].x,*/

main/dengitor/res/default/dengine-editor-ui.glade

@@ -1948,6 +1948,9 @@ audio-volume-medium-symbolic</property>
                                   <object class="GtkTreeView" id="log">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection"/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -2156,6 +2159,7 @@ audio-volume-medium-symbolic</property>
                 <property name="language">en-gb</property>
                 <property name="preview-text"/>
                 <signal name="font-set" handler="_dengitor_prefs_fontset" swapped="no"/>
+                <signal name="map" handler="_dengitor_prefs_fontset_onmap" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">True</property>

main/dengitor/src/prefs.c

@@ -42,6 +42,17 @@ DENGINE_EXPORT void _dengitor_prefs_fontset(GtkFontButton* btn)
     dengitor_redraw();
 }
 
+DENGINE_EXPORT void _dengitor_prefs_fontset_onmap(GtkFontButton* btn)
+{
+    GtkFontChooser* font_chooser = GTK_FONT_CHOOSER(btn);
+    char* font;
+    GtkSettings* settings = gtk_settings_get_for_screen(gdk_screen_get_default());
+
+    g_object_get(settings, "gtk-font-name", &font, NULL);
+    gtk_font_chooser_set_font(font_chooser, font);
+    free(font);
+}
+
 void dengitor_prefs_setup(GtkBuilder* builder, DengitorPrefs* prefs)
 {
     prefs->provider = gtk_css_provider_new();