Implements ImageKernelConvolution

Author: chrisws

raylib/README.md

@@ -1,4 +1,4 @@
-*Raylib* _MAJOR 5 _MINOR 0 _PATCH 0 5.0
+*Raylib* _MAJOR 5 _MINOR 1 _PATCH 0 5.1-dev
 =======
 raylib is a simple and easy-to-use library to enjoy videogames programming.
 
@@ -353,6 +353,7 @@ Implemented APIs (604)
 | sub ImageFlipVertical(image) | Flip image vertically |
 | sub ImageFormat(image, newFormat) | Convert image data to desired format |
 | func ImageFromImage(image, rec) | Create an image from another image piece |
+| sub ImageKernelConvolution(image, kernel, kernelSize) | Apply Custom Square image convolution kernel |
 | sub ImageMipmaps(image) | Compute all mipmap levels for a provided image |
 | sub ImageResize(image, newWidth, newHeight) | Resize image (Bicubic scaling algorithm) |
 | sub ImageResizeCanvas(image, newWidth, newHeight, offsetX, offsetY, fill) | Resize canvas and fill with color |
@@ -575,7 +576,6 @@ Implemented APIs (604)
 | sub UnloadAutomationEventList(list) | Unload automation events list from file |
 | sub UnloadCodepoints(codepoints) | Unload codepoints data from memory |
 | sub UnloadDirectoryFiles(files) | Unload filepaths |
-| sub UnloadDroppedFiles(files) | Unload dropped filepaths |
 | sub UnloadFileData(data) | Unload file data allocated by LoadFileData() |
 | sub UnloadFileText(text) | Unload file text data allocated by LoadFileText() |
 | sub UnloadFont(font) | Unload font from GPU memory (VRAM) |

raylib/main.cpp

@@ -876,6 +876,28 @@ static int cmd_updateautomationeventlist(int argc, slib_par_t *params, var_t *re
   return result;
 }
 
+//
+// Apply Custom Square image convolution kernel
+//
+static int cmd_imagekernelconvolution(int argc, slib_par_t *params, var_t *retval) {
+  int result;
+  int image_id = get_image_id(argc, params, 0, retval);
+  if (image_id != -1 && is_param_array(argc, params, 1)) {
+    var_p_t array = params[1].var_p;
+    int kernelSize = v_asize(array);
+    float *kernel = new float[kernelSize];
+    for (int i = 0; i < kernelSize; i++) {
+      kernel[i] = get_num(v_elem(array, i));
+    }
+    ImageKernelConvolution(&_imageMap.at(image_id), kernel, kernelSize);
+    delete [] kernel;
+    result = 1;
+  } else {
+    result = 0;
+  }
+  return result;
+}
+
 #include "proc.h"
 #include "func.h"
 
@@ -1793,6 +1815,7 @@ static FUNC_SIG lib_func[] = {
 
 static FUNC_SIG lib_proc[] = {
 #include "proc-def.h"
+  {2, 2, "IMAGEKERNELCONVOLUTION", cmd_imagekernelconvolution},
   {4, 5, "SETSHADERVALUE", cmd_setshadervalue},
   {2, 2, "SETMODELDIFFUSETEXTURE", cmd_setmodeldiffusetexture},
   {4, 4, "SETMODELTRANSFORM", cmd_setmodeltransform},

raylib/mkraylib.bas

@@ -293,8 +293,10 @@ func is_internal(name)
           name == "LoadRenderTexture" || &
           name == "LoadShader" || &
           name == "SetShaderValue" || &
+          name == "ImageKernelConvolution" || &
           name == "TextFormat" || &
           name == "TraceLog" || &
+          name == "UnloadDroppedFiles" || &
           name == "UpdateCameraPro" || &
           name == "UpdateCamera" || &
           name == "UpdateTexture")

raylib/proc-def.h

@@ -229,7 +229,6 @@
   {1, 1, "UNLOADAUTOMATIONEVENTLIST", cmd_unloadautomationeventlist},
   {0, 0, "UNLOADCODEPOINTS", cmd_unloadcodepoints},
   {1, 1, "UNLOADDIRECTORYFILES", cmd_unloaddirectoryfiles},
-  {1, 1, "UNLOADDROPPEDFILES", cmd_unloaddroppedfiles},
   {1, 1, "UNLOADFILEDATA", cmd_unloadfiledata},
   {1, 1, "UNLOADFILETEXT", cmd_unloadfiletext},
   {1, 1, "UNLOADFONT", cmd_unloadfont},

raylib/proc.h

@@ -3023,15 +3023,6 @@ static int cmd_unloaddirectoryfiles(int argc, slib_par_t *params, var_t *retval)
   return 1;
 }
 
-//
-// Unload dropped filepaths
-//
-static int cmd_unloaddroppedfiles(int argc, slib_par_t *params, var_t *retval) {
-  auto files = get_param_filepathlist(argc, params, 0);
-  UnloadDroppedFiles(files);
-  return 1;
-}
-
 //
 // Unload file data allocated by LoadFileData()
 //

raylib/raygui

@@ -141,36 +141,29 @@ while (!rl.WindowShouldClose())
 
   if (rl.IsKeyPressed(c.KEY_R)) then
     REM Reset game state
-    player.position.x = 400
-    player.position.y = 280
-    player.speed = 0
-    player.canJump = false
-    camera.target = player.position
-    camera.offset.x = screenWidth/2.0
-    camera.offset.y = screenHeight/2.0
-    camera.rotation = 0.0
-    camera.zoom = 1.0
+    reset_player()
+    reset_camera()
   endif
 
   REM Update camera
   camera.target = player.position
   camera.offset.x = screenWidth/2.0
   camera.offset.y = screenHeight/2.0
-  minX = 1000
-  minY = 1000
-  maxX = -1000
-  maxY = -1000
-
-  for i = 0 to MAX_ENVIRONMENT_ELEMENTS - 1
-    minX = min(element._rect.x, minX)
-    maxX = max(element._rect.x + element._rect.width, maxX)
-    minY = min(element._rect.y, minY)
-    maxY = max(element._rect.y + element._rect.height, maxY)
-  next
-
-  _max = rl.GetWorldToScreen2D([maxX, maxY], camera)
-  _min = rl.GetWorldToScreen2D([minX, minY], camera)
-
+'  minX = 1000
+'  minY = 1000
+'  maxX = -1000
+'  maxY = -1000
+'
+'  for i = 0 to MAX_ENVIRONMENT_ELEMENTS - 1
+'    minX = min(element._rect.x, minX)
+'    maxX = max(element._rect.x + element._rect.width, maxX)
+'    minY = min(element._rect.y, minY)
+'    maxY = max(element._rect.y + element._rect.height, maxY)
+'  next
+'
+'  _max = rl.GetWorldToScreen2D([maxX, maxY], camera)
+'  _min = rl.GetWorldToScreen2D([minX, minY], camera)
+'
 '  if (_max.x < screenWidth) then camera.offset.x = screenWidth - (_max.x - screenWidth/2)
 '  if (_max.y < screenHeight) then camera.offset.y = screenHeight - (_max.y - screenHeight/2)
 '  if (_min.x > 0) then camera.offset.x = screenWidth/2 - _min.x

raylib/raylib

@@ -0,0 +1,93 @@
+REM /*******************************************************************************************
+REM *
+REM *   raylib [textures] example - Image loading and texture creation
+REM *
+REM *   NOTE: Images are loaded in CPU memory (RAM); textures are loaded in GPU memory (VRAM)
+REM *
+REM *   Example originally created with raylib 1.3, last time updated with raylib 1.3
+REM *
+REM *   Example licensed under an unmodified zlib/libpng license, which is an OSI-certified,
+REM *   BSD-like license that allows static linking with closed source software
+REM *
+REM *   Copyright (c) 2015-2023 Karim Salem (@kimo-s)
+REM *
+REM ********************************************************************************************/
+
+import raylib as rl
+import raylibc as c
+
+sub normalizeKernel(byref kernel, size)
+  local _sum = 0
+  local i
+  for i = 0 to size - 1
+    _sum += kernel[i]
+  next
+
+  if (_sum != 0) then
+    for i = 0 to size - 1
+      kernel[i] /= _sum
+    next
+  endif
+end
+
+const resources = CWD + "raylib/examples/textures/resources/"
+const _image = rl.LoadImage(resources + "cat.png")
+const screenWidth = 800
+const screenHeight = 450
+
+rl.InitWindow(screenWidth, screenHeight, "raylib [textures] example - image convolution")
+
+gaussiankernel = [1.0, 2.0, 1.0, 2.0, 4.0, 2.0, 1.0, 2.0, 1.0]
+sobelkernel = [1.0, 0.0, -1.0, 2.0, 0.0, -2.0,1.0, 0.0, -1.0]
+sharpenkernel = [0.0, -1.0, 0.0, -1.0, 5.0, -1.0, 0.0, -1.0, 0.0]
+
+normalizeKernel(gaussiankernel, 9)
+normalizeKernel(sharpenkernel, 9)
+normalizeKernel(sobelkernel, 9)
+
+catSharpend = rl.ImageCopy(_image)
+rl.ImageKernelConvolution(catSharpend, sharpenkernel)
+
+catSobel = rl.ImageCopy(_image)
+rl.ImageKernelConvolution(catSobel, sobelkernel)
+
+catGaussian = rl.ImageCopy(_image)
+for i = 0 to 6
+  rl.ImageKernelConvolution(catGaussian, gaussiankernel)
+next
+
+rl.ImageCrop(_image, [0, 0, 200, 450])
+rl.ImageCrop(catGaussian, [0, 0, 200, 450])
+rl.ImageCrop(catSobel, [0, 0, 200, 450])
+rl.ImageCrop(catSharpend, [0, 0, 200, 450])
+texture = rl.LoadTextureFromImage(_image)          ' Image converted to texture, GPU memory (VRAM)
+catSharpendTexture = rl.LoadTextureFromImage(catSharpend)
+catSobelTexture = rl.LoadTextureFromImage(catSobel)
+catGaussianTexture = rl.LoadTextureFromImage(catGaussian)
+
+rl.UnloadImage(_image)   ' Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM
+rl.UnloadImage(catGaussian)
+rl.UnloadImage(catSobel)
+rl.UnloadImage(catSharpend)
+
+rl.SetTargetFPS(60)
+while (!rl.WindowShouldClose())
+  rl.BeginDrawing()
+  rl.ClearBackground(c.RAYWHITE)
+  rl.DrawTexture(catSharpendTexture, 0, 0, c.WHITE)
+  rl.DrawText("Sharpend", 0, 0, 20, c.RED)
+  rl.DrawTexture(catSobelTexture, 200, 0, c.WHITE)
+  rl.DrawText("Sobel", 200, 0, 20, c.RED)
+  rl.DrawTexture(catGaussianTexture, 400, 0, c.WHITE)
+  rl.DrawText("Gaussian", 400, 0, 20, c.RED)
+  rl.DrawTexture(texture, 600, 0, c.WHITE)
+  rl.DrawText("Original", 600, 0, 20, c.RED)
+  rl.EndDrawing()
+wend
+
+rl.UnloadTexture(texture)
+rl.UnloadTexture(catGaussianTexture)
+rl.UnloadTexture(catSobelTexture)
+rl.UnloadTexture(catSharpendTexture)
+rl.CloseWindow()
+