Merge branch 'master' of github.com:VoxelTek/isle-portable

CMakeLists.txt

@@ -4,7 +4,7 @@ project(isle LANGUAGES CXX C VERSION 0.1)
 
 if (EMSCRIPTEN)
   add_compile_options(-pthread)
-  add_link_options(-sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=2gb -sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1)
+  add_link_options(-sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=2gb -sUSE_PTHREADS=1 -sPROXY_TO_PTHREAD=1 -sOFFSCREENCANVAS_SUPPORT=1 -sPTHREAD_POOL_SIZE_STRICT=0 -sFORCE_FILESYSTEM=1 -sWASMFS=1 -sEXIT_RUNTIME=1)
   set(SDL_PTHREADS ON CACHE BOOL "Enable SDL pthreads" FORCE)
 endif()
 
@@ -38,14 +38,14 @@ option(ISLE_WERROR "Treat warnings as errors" OFF)
 option(ISLE_DEBUG "Enable imgui debug" ON)
 cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF)
 cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF)
-cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "MSVC OR ISLE_MINIWIN;NOT NINTENDO_3DS" OFF)
+cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "(MSVC OR ISLE_MINIWIN) AND (NOT PSP) AND (NOT NINTENDO_3DS)" OFF)
 cmake_dependent_option(ISLE_COMPILE_SHADERS "Compile shaders" ON "SDL_SHADERCROSS_BIN;TARGET Python3::Interpreter" OFF)
-option(CMAKE_POSITION_INDEPENDENT_CODE "Build with -fPIC" ON)
+cmake_dependent_option(CMAKE_POSITION_INDEPENDENT_CODE "Build with -fPIC" ON "NOT PSP" OFF)
 option(ENABLE_CLANG_TIDY "Enable clang-tidy")
 option(DOWNLOAD_DEPENDENCIES "Download dependencies" ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" CACHE PATH "Directory where to put executables and dll")
 set(ISLE_EMSCRIPTEN_HOST "" CACHE STRING "Host URL for Emscripten streaming (e.g., https://test.com)")
-cmake_dependent_option(BUILD_SHARED_LIBS "Build lego1 as a shared library" ON "NOT EMSCRIPTEN" OFF)
+cmake_dependent_option(BUILD_SHARED_LIBS "Build lego1 as a shared library" ON "NOT EMSCRIPTEN AND NOT PSP" OFF)
 
 message(STATUS "Isle app:               ${ISLE_BUILD_APP}")
 message(STATUS "Config app:             ${ISLE_BUILD_CONFIG}")
@@ -58,15 +58,19 @@ add_library(Isle::iniparser INTERFACE IMPORTED)
 
 if (DOWNLOAD_DEPENDENCIES)
     # FetchContent downloads and configures dependencies
-    message(STATUS "Fetching SDL3 and iniparser. This might take a while...")
     include(FetchContent)
-    FetchContent_Declare(
+    if (NOT PSP)
-        SDL3
+      message(STATUS "Fetching SDL3 and iniparser. This might take a while...")
-        GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
+      FetchContent_Declare(
-        GIT_TAG "main"
+          SDL3
-        EXCLUDE_FROM_ALL
+          GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
-    )
+          GIT_TAG "main"
-    FetchContent_MakeAvailable(SDL3)
+          EXCLUDE_FROM_ALL
+      )
+      FetchContent_MakeAvailable(SDL3)
+    else()
+      find_package(SDL3 CONFIG REQUIRED)
+    endif()
 
     FetchContent_Declare(
         iniparser
@@ -348,6 +352,11 @@ if (WIN32)
   target_link_libraries(lego1 INTERFACE winmm)
 endif()
 target_link_libraries(lego1 PRIVATE libsmacker miniaudio)
+
+if (PSP)
+  target_link_libraries(lego1 PRIVATE atomic)
+endif()
+
 target_include_directories(lego1 PUBLIC $<BUILD_INTERFACE:$<TARGET_PROPERTY:miniaudio,INTERFACE_INCLUDE_DIRECTORIES>>)
 
 # lego1_impl sources
@@ -505,6 +514,9 @@ if (ISLE_BUILD_APP)
     )
     target_compile_definitions(isle PRIVATE ISLE_DEBUG)
     target_link_libraries(isle PRIVATE imgui)
+    if(PSP)
+      target_compile_definitions(imgui PRIVATE IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS)
+    endif()
     find_path(valgrind_INCLUDE_PATH NAMES valgrind/callgrind.h)
     if(valgrind_INCLUDE_PATH)
       # Run isle under valgrind to create a profile. Use e.g. kcachegrind to view the profile.
@@ -673,6 +685,18 @@ if(NINTENDO_3DS)
 endif()
 if(MSVC)
   set(CPACK_GENERATOR ZIP)
+elseif(PSP)
+    # Create an EBOOT.PBP file
+    create_pbp_file(
+        TARGET ${PROJECT_NAME}
+        ICON_PATH "${CMAKE_SOURCE_DIR}/XMB/Game/ICON0.png"
+        ANIM_PATH "${CMAKE_SOURCE_DIR}/XMB/Game/ICON1.pmf"
+        BACKGROUND_PATH "${CMAKE_SOURCE_DIR}/XMB/Game/PIC1.png"
+        PREVIEW_PATH NULL
+        MUSIC_PATH "${CMAKE_SOURCE_DIR}/XMB/Game/SND0.at3"
+        TITLE ${PROJECT_NAME}
+        VERSION 01.00
+    )
 else()
   set(CPACK_GENERATOR TGZ)
 endif()

ISLE/isleapp.cpp

@@ -665,7 +665,9 @@ MxResult IsleApp::SetupWindow()
 #if defined(MINIWIN) && !defined(__3DS__)
 	SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, true);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+#ifndef __PSP__
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+#endif
 #endif
 
 	window = SDL_CreateWindowWithProperties(props);

LEGO1/omni/include/mxthread.h

@@ -5,7 +5,11 @@
 #include "mxsemaphore.h"
 #include "mxtypes.h"
 
+#ifdef PSP
+#include <pspkerneltypes.h>
+#else
 #include <SDL3/SDL_thread.h>
+#endif
 
 class MxCore;
 
@@ -33,9 +37,15 @@ class MxThread {
 	virtual ~MxThread();
 
 private:
+#ifdef PSP
+	static int ThreadProc(SceSize args, void* argp);
+
+	int m_thread;
+#else
 	static int SDLCALL ThreadProc(void* p_thread);
 
 	SDL_Thread* m_thread;
+#endif
 	MxBool m_running;        // 0x0c
 	MxSemaphore m_semaphore; // 0x10
 

LEGO1/omni/src/system/mxthread.cpp

@@ -3,13 +3,20 @@
 #include "decomp.h"
 
 #include <SDL3/SDL_timer.h>
+#ifdef PSP
+#include <pspkernel.h>
+#endif
 
 DECOMP_SIZE_ASSERT(MxThread, 0x1c)
 
 // FUNCTION: LEGO1 0x100bf510
 MxThread::MxThread()
 {
+#ifdef PSP
+	m_thread = 0;
+#else
 	m_thread = NULL;
+#endif
 	m_running = TRUE;
 }
 
@@ -17,7 +24,13 @@ MxThread::MxThread()
 MxThread::~MxThread()
 {
 	if (m_thread) {
+#ifdef PSP
+		sceKernelWaitThreadEnd(m_thread, NULL);
+		sceKernelDeleteThread(m_thread);
+		m_thread = 0;
+#else
 		SDL_WaitThread(m_thread, NULL);
+#endif
 	}
 }
 
@@ -27,6 +40,25 @@ MxResult MxThread::Start(MxS32 p_stackSize, MxS32 p_flag)
 	MxResult result = FAILURE;
 
 	if (m_semaphore.Init(0, 1) == SUCCESS) {
+#ifdef PSP
+		int thid = sceKernelCreateThread(
+			"MxThread",
+			ThreadProc,
+			0x18, // priority (0x18 is typical)
+			p_stackSize * 4,
+			0,
+			NULL
+		);
+
+		if (thid >= 0) {
+			MxThread* self = this;
+			int start = sceKernelStartThread(thid, sizeof(MxThread*), &self);
+			if (start >= 0) {
+				result = SUCCESS;
+				m_thread = thid; // store thread ID if needed
+			}
+		}
+#else
 		const SDL_PropertiesID props = SDL_CreateProperties();
 		SDL_SetPointerProperty(props, SDL_PROP_THREAD_CREATE_ENTRY_FUNCTION_POINTER, (void*) MxThread::ThreadProc);
 		SDL_SetPointerProperty(props, SDL_PROP_THREAD_CREATE_USERDATA_POINTER, this);
@@ -37,6 +69,7 @@ MxResult MxThread::Start(MxS32 p_stackSize, MxS32 p_flag)
 		}
 
 		SDL_DestroyProperties(props);
+#endif
 	}
 
 	return result;
@@ -55,11 +88,19 @@ void MxThread::Terminate()
 	m_semaphore.Wait();
 }
 
+#ifdef PSP
+int MxThread::ThreadProc(SceSize args, void* argp)
+{
+	MxThread* self = *(MxThread**) argp;
+	return self->Run();
+}
+#else
 // FUNCTION: LEGO1 0x100bf680
 int MxThread::ThreadProc(void* p_thread)
 {
 	return static_cast<MxThread*>(p_thread)->Run();
 }
+#endif
 
 // FUNCTION: LEGO1 0x100bf690
 MxResult MxThread::Run()

XMB/Save/Memory Stick Model Source.txt

@@ -0,0 +1 @@
+The model was sourced from https://3dwarehouse.sketchup.com/model/c300a598e63cb2f593dcf5e22ecc3f5e/Memory-Stick-Pro-Duo. It was further modified by Sonen10 to get the results seen in the animation.

XMB/explanation.txt

@@ -0,0 +1,10 @@
+Explanation of where the assets in these folders are used
+ICON0.PNG - Icon used in various scenarios depending on if it's used for a save or a game. This includes when:
+> The game/save isn't selected in the XMB 
+> There is no ICON1.PMF present (XMB only)
+> The "Group Content" mode is enabled in the XMB game selection menu
+> The game is on a save management screen with UI elements shared with the XMB (note the font)
+ICON1.PMF - Seen when the game/save is selected in the XMB (NOT IN-GAME)
+PIC1.PNG - Seen as a background when the game/save is selected in the XMB
+SND0.AT3 - Plays when the game/save is selected in the XMB (NOT IN-GAME)
+EMPTY.PNG - Used as an icon for empty saves when selecting a save to write to.

miniwin/CMakeLists.txt

@@ -45,11 +45,13 @@ else()
 endif()
 
 find_library(OPENGL_ES2_LIBRARY NAMES GLESv2)
-if(OPENGL_ES2_LIBRARY)
+if(EMSCRIPTEN OR OPENGL_ES2_LIBRARY)
   message(STATUS "Found OpenGL: enabling OpenGL ES 2.x renderer")
   target_sources(miniwin PRIVATE src/d3drm/backends/opengles2/renderer.cpp)
   target_compile_definitions(miniwin PRIVATE USE_OPENGLES2)
-  target_link_libraries(miniwin PRIVATE OpenGL::GL)
+  if(OPENGL_ES2_LIBRARY)
+    target_link_libraries(miniwin PRIVATE OpenGL::GL)
+  endif()
 else()
   message(STATUS "🧩 OpenGL ES 2.x support not enabled")
 endif()

miniwin/src/d3drm/backends/opengl1/actual.cpp

@@ -211,8 +211,18 @@ void GL11_SubmitDraw(
 	glLoadMatrixf(&modelViewMatrix[0][0]);
 	glEnable(GL_NORMALIZE);
 
+#ifndef __PSP__
 	glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
 	glColor4ub(appearance.color.r, appearance.color.g, appearance.color.b, appearance.color.a);
+#else
+	GLfloat color[4] = {
+		appearance.color.r / 255.0f,
+		appearance.color.g / 255.0f,
+		appearance.color.b / 255.0f,
+		appearance.color.a / 255.0f
+	};
+	glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color);
+#endif
 
 	if (appearance.shininess != 0.0f) {
 		GLfloat whiteSpec[] = {1.f, 1.f, 1.f, 1.f};

miniwin/src/d3drm/backends/opengl1/renderer.cpp

@@ -23,7 +23,9 @@ Direct3DRMRenderer* OpenGL1Renderer::Create(DWORD width, DWORD height)
 	// call below when on an EGL-based backend, and crashes with EGL_BAD_MATCH.
 	SDL_GL_ResetAttributes();
 	// But ResetAttributes resets it to 16.
+#ifndef __PSP__
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+#endif
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

miniwin/src/internal/d3drmrenderer_opengl1.h

@@ -56,11 +56,13 @@ class OpenGL1Renderer : public Direct3DRMRenderer {
 
 inline static void OpenGL1Renderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void* ctx)
 {
+#ifndef __PSP__
 	Direct3DRMRenderer* device = OpenGL1Renderer::Create(640, 480);
 	if (!device) {
 		return;
 	}
 	delete device;
+#endif
 
 	D3DDEVICEDESC halDesc = {};
 	halDesc.dcmColorModel = D3DCOLORMODEL::RGB;