Decode PNG and JPEG textures with stb_image

.github/workflows/build.yml

@@ -27,9 +27,7 @@ jobs:
           sudo apt update
           sudo apt install -y \
             luarocks \
-            libpng-dev \
             libfreetype6-dev \
-            libjpeg-dev \
             liblua5.4-dev \
             libxml2-dev \
             liblz4-dev \
@@ -79,9 +77,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew install \
-            libpng \
             freetype \
-            jpeg-turbo \
             lua@5.4 \
             luarocks \
             libxml2 \

.github/workflows/copilot-setup-steps.yml

@@ -31,9 +31,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             build-essential \
             pkg-config \
-            libpng-dev \
             libfreetype6-dev \
-            libjpeg-dev \
             liblua5.4-dev \
             libxml2-dev \
             liblz4-dev \

.opencode/skills/orca-blender-pipeline/SKILL.md

@@ -16,8 +16,7 @@ running). This skill is about what the Blender file must look like.
 ## Setup
 
 ```bash
-brew install lz4 freetype jpeg libpng          # engine deps on macOS
-export PKG_CONFIG_PATH=/opt/homebrew/opt/jpeg/lib/pkgconfig:$PKG_CONFIG_PATH
+brew install lz4 freetype                     # engine deps on macOS
 make                                           # engine
 make orca-fbx                                  # needs /Applications/Autodesk/FBX SDK/2020.2
 ```

LUAROCKS.md

@@ -11,9 +11,7 @@ Before installing ORCA via LuaRocks, ensure you have the required system librari
 **Ubuntu/Debian:**
 ```bash
 sudo apt update && sudo apt install -y \
-    libpng-dev \
     libfreetype6-dev \
-    libjpeg-dev \
     liblua5.4-dev \
     libxml2-dev \
     liblz4-dev \
@@ -27,9 +25,7 @@ sudo apt update && sudo apt install -y \
 **Fedora:**
 ```bash
 sudo dnf install -y \
-    libpng-devel \
     freetype-devel \
-    libjpeg-turbo-devel \
     lua-devel \
     libxml2-devel \
     lz4-devel \
@@ -39,7 +35,7 @@ sudo dnf install -y \
 
 **macOS:**
 ```bash
-brew install libpng freetype jpeg-turbo lua libxml2 lz4 zlib curl pkg-config
+brew install freetype lua libxml2 lz4 zlib curl pkg-config
 ```
 
 ### Installing from Source

Makefile

@@ -55,8 +55,8 @@ HEADERS = $(wildcard *.h)
 SOURCEMODULES2 = $(addprefix /, $(MODULES))
 UNITEOBJECTS = $(addsuffix .o, $(MODULES))
 UNITE = $(patsubst %.c, %.o, $(foreach dir,$(SOURCEMODULES),$(shell find $(dir) -name "*.c" 2>/dev/null)))
-CFLAGS += $(shell pkg-config --cflags zlib liblz4 lua5.4 libjpeg freetype2 libxml-2.0 2>/dev/null || pkg-config --cflags zlib liblz4 lua libjpeg freetype2 libxml-2.0 2>/dev/null)
-LDFLAGS += $(shell pkg-config --libs zlib liblz4 lua5.4 freetype2 libjpeg libpng libxml-2.0 2>/dev/null || pkg-config --libs zlib liblz4 lua freetype2 libjpeg libpng libxml-2.0 2>/dev/null)
+CFLAGS += $(shell pkg-config --cflags zlib liblz4 lua5.4 freetype2 libxml-2.0 2>/dev/null || pkg-config --cflags zlib liblz4 lua freetype2 libxml-2.0 2>/dev/null)
+LDFLAGS += $(shell pkg-config --libs zlib liblz4 lua5.4 freetype2 libxml-2.0 2>/dev/null || pkg-config --libs zlib liblz4 lua freetype2 libxml-2.0 2>/dev/null)
 
 ifeq ($(UNAME_S),Darwin)
 	CFLAGS += -DGL_SILENCE_DEPRECATION

Makefile.webgl

@@ -11,7 +11,7 @@
 #   emmake make wasm-deps
 #
 # Libraries available as Emscripten ports (no manual build needed):
-#   zlib, libpng, libjpeg, freetype  -- provided via -sUSE_* flags below.
+#   zlib, freetype  -- provided via -sUSE_* flags below.
 #
 # Usage:
 #   make webgl                          # build with share/ assets only
@@ -55,11 +55,11 @@ WEBGL_PLUGIN_SRCS = $(foreach p, $(WEBGL_PLUGINS), $(wildcard $(PLUGINDIR)/$(p)/
 WEBGL_PLUGINS_H   = $(WEBGL_DIR)/plugins_luaopen.h
 
 WEBGL_CFLAGS  = -Oz -flto -I. -I$(CURDIR) -Igenerated -I$(PLATFORM_LIBDIR) \
-                -sUSE_ZLIB=1 -sUSE_LIBPNG=1 -sUSE_FREETYPE=1 -sUSE_LIBJPEG=1 \
+                -sUSE_ZLIB=1 -sUSE_FREETYPE=1 \
                 -sUSE_WEBGL2=1 -sMIN_WEBGL_VERSION=1 -sMAX_WEBGL_VERSION=2 \
                 -sFETCH=1
 
-WEBGL_LDFLAGS = -sUSE_ZLIB=1 -sUSE_LIBPNG=1 -sUSE_FREETYPE=1 -sUSE_LIBJPEG=1 \
+WEBGL_LDFLAGS = -sUSE_ZLIB=1 -sUSE_FREETYPE=1 \
                 -sUSE_WEBGL2=1 -sMIN_WEBGL_VERSION=1 -sMAX_WEBGL_VERSION=2 \
                 -sINITIAL_MEMORY=64MB \
                 -sEXPORTED_RUNTIME_METHODS='["ccall","cwrap","FS"]' \

README.md

@@ -27,9 +27,7 @@ To install the required dependencies on **Linux**, run the following commands:
 
 ```sh
 sudo apt update && sudo apt install -y \
-    libpng-dev \
     libfreetype6-dev \
-    libjpeg-dev \
     liblua5.4-dev \
     libxml2-dev \
     liblz4-dev \
@@ -44,9 +42,7 @@ For **Fedora**, use:
 
 ```sh
 sudo dnf install -y \
-    libpng-devel \
     freetype-devel \
-    libjpeg-turbo-devel \
     lua-devel \
     libxml2-devel \
     lz4-devel \
@@ -57,21 +53,21 @@ sudo dnf install -y \
 For **Arch Linux**, use:
 
 ```sh
-sudo pacman -S libpng freetype2 libjpeg-turbo lua libxml2 lz4 zlib curl
+sudo pacman -S freetype2 lua libxml2 lz4 zlib curl
 ```
 
 ### macOS
 
 To install dependencies on **macOS**, use **Homebrew**:
 
 ```sh
-brew install libpng freetype jpeg-turbo lua libxml2 lz4 zlib curl pkg-config
+brew install freetype lua libxml2 lz4 zlib curl pkg-config
 ```
 
 **Note**: If `pkg-config` fails to find packages, you may need to run:
 
 ```sh
-brew link --overwrite freetype jpeg-turbo
+brew link --overwrite freetype
 ```
 
 ## Building the Project

docs/webgl.md

@@ -103,8 +103,6 @@ These libraries are fetched and compiled automatically by Emscripten via
 | Library   | Flag              |
 |-----------|-------------------|
 | zlib      | `-sUSE_ZLIB=1`    |
-| libpng    | `-sUSE_LIBPNG=1`  |
-| libjpeg   | `-sUSE_LIBJPEG=1` |
 | freetype  | `-sUSE_FREETYPE=1`|
 
 ### WASM libraries (built from source with emmake)

orca.xcodeproj/project.pbxproj

@@ -44,8 +44,7 @@
 		781CA71F2E15370700FFCFD9 /* r_texture.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136DB2AF3CC4E00AAAE53 /* r_texture.c */; };
 		781CA7202E15370700FFCFD9 /* r_image_astc.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136D52AF3CC4E00AAAE53 /* r_image_astc.c */; };
 		781CA7212E15370700FFCFD9 /* r_image_dds.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136D12AF3CC4E00AAAE53 /* r_image_dds.c */; };
-		781CA7222E15370700FFCFD9 /* r_image_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136DE2AF3CC4E00AAAE53 /* r_image_jpeg.c */; };
-		781CA7232E15370700FFCFD9 /* r_image_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136E12AF3CC4E00AAAE53 /* r_image_png.c */; };
+		781CA7222E15370700FFCFD9 /* r_image_stb.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136DE2AF3CC4E00AAAE53 /* r_image_stb.c */; };
 		781CA7242E15370700FFCFD9 /* r_image_pvr.c in Sources */ = {isa = PBXBuildFile; fileRef = 78B136DF2AF3CC4E00AAAE53 /* r_image_pvr.c */; };
 		781CA7292E15374000FFCFD9 /* liborca.renderer.so in Frameworks */ = {isa = PBXBuildFile; fileRef = 781CA7052E15369F00FFCFD9 /* liborca.renderer.so */; };
 		781CA7B02E20000000AABBCC /* VectorView.c in Sources */ = {isa = PBXBuildFile; fileRef = 781CA7B12E20000000AABBCC /* VectorView.c */; };
@@ -600,9 +599,8 @@
 		78B136DB2AF3CC4E00AAAE53 /* r_texture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_texture.c; sourceTree = "<group>"; };
 		78B136DC2AF3CC4E00AAAE53 /* r_model.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_model.c; sourceTree = "<group>"; };
 		78B136DD2AF3CC4E00AAAE53 /* r_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_font.c; sourceTree = "<group>"; };
-		78B136DE2AF3CC4E00AAAE53 /* r_image_jpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_image_jpeg.c; sourceTree = "<group>"; };
+		78B136DE2AF3CC4E00AAAE53 /* r_image_stb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_image_stb.c; sourceTree = "<group>"; };
 		78B136DF2AF3CC4E00AAAE53 /* r_image_pvr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_image_pvr.c; sourceTree = "<group>"; };
-		78B136E12AF3CC4E00AAAE53 /* r_image_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_image_png.c; sourceTree = "<group>"; };
 		78B136E22AF3CC4E00AAAE53 /* r_state.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_state.c; sourceTree = "<group>"; };
 		78B136F42AF3CC4E00AAAE53 /* filesystem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filesystem.c; sourceTree = "<group>"; };
 		78B137452AF3CC4E00AAAE53 /* shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shared.h; sourceTree = "<group>"; };
@@ -1269,8 +1267,7 @@
 				78E4A9D82E9549F200E3A503 /* r_gradient_texture.c */,
 				78B136D52AF3CC4E00AAAE53 /* r_image_astc.c */,
 				78B136D12AF3CC4E00AAAE53 /* r_image_dds.c */,
-				78B136DE2AF3CC4E00AAAE53 /* r_image_jpeg.c */,
-				78B136E12AF3CC4E00AAAE53 /* r_image_png.c */,
+				78B136DE2AF3CC4E00AAAE53 /* r_image_stb.c */,
 				78B136DF2AF3CC4E00AAAE53 /* r_image_pvr.c */,
 				78E4A9D42E9548B800E3A503 /* r_render_texture.c */,
 				78B136DB2AF3CC4E00AAAE53 /* r_texture.c */,
@@ -1851,8 +1848,7 @@
 				781CA71F2E15370700FFCFD9 /* r_texture.c in Sources */,
 				781CA7202E15370700FFCFD9 /* r_image_astc.c in Sources */,
 				781CA7212E15370700FFCFD9 /* r_image_dds.c in Sources */,
-				781CA7222E15370700FFCFD9 /* r_image_jpeg.c in Sources */,
-				781CA7232E15370700FFCFD9 /* r_image_png.c in Sources */,
+				781CA7222E15370700FFCFD9 /* r_image_stb.c in Sources */,
 				781CA7242E15370700FFCFD9 /* r_image_pvr.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2212,7 +2208,6 @@
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				LIBRARY_SEARCH_PATHS = (
 					/opt/homebrew/lib,
-					/opt/homebrew/opt/jpeg/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
 				OTHER_LDFLAGS = "$(inherited)";
@@ -2234,7 +2229,6 @@
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				LIBRARY_SEARCH_PATHS = (
 					/opt/homebrew/lib,
-					/opt/homebrew/opt/jpeg/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2260,8 +2254,6 @@
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
 				OTHER_LDFLAGS = (
 					"-llua",
-					"-ljpeg",
-					"-lpng",
 					"-lfreetype",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2283,8 +2275,6 @@
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
 				OTHER_LDFLAGS = (
 					"-llua",
-					"-ljpeg",
-					"-lpng",
 					"-lfreetype",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2689,7 +2679,6 @@
 					"$(SRCROOT)/generated",
 					/opt/homebrew/include,
 					/opt/homebrew/include/freetype2,
-					/opt/homebrew/opt/jpeg/include,
 				);
 				LIBRARY_SEARCH_PATHS = /opt/homebrew/lib;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
@@ -2760,7 +2749,6 @@
 					"$(SRCROOT)/generated",
 					/opt/homebrew/include,
 					/opt/homebrew/include/freetype2,
-					/opt/homebrew/opt/jpeg/include,
 				);
 				LIBRARY_SEARCH_PATHS = /opt/homebrew/lib;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;