Merge pull request #11 from vircon32/PNGJoiner

Merge PNGJoiner branch to main

Author: vircon32

DevelopmentTools/Assembler/Main.cpp

@@ -53,7 +53,7 @@ void PrintUsage()
 
 void PrintVersion()
 {
-    cout << "assemble v24.8.4" << endl;
+    cout << "assemble v25.1.4" << endl;
     cout << "Vircon32 assembler by Javier Carracedo" << endl;
 }
 

DevelopmentTools/CCompiler/Main.cpp

@@ -57,7 +57,7 @@ void PrintUsage()
 
 void PrintVersion()
 {
-    cout << "compile v24.8.4" << endl;
+    cout << "compile v25.1.4" << endl;
     cout << "Vircon32 C compiler by Javier Carracedo" << endl;
 }
 

DevelopmentTools/CMakeLists.txt

@@ -34,6 +34,8 @@ set(WAV_CONVERTER_DIR "WAV2Vircon/"
     CACHE PATH "The path to the WAV converter sources.")
 set(TILED_CONVERTER_DIR "Tiled2Vircon/"
     CACHE PATH "The path to the Tiled converter sources.")
+set(PNG_JOINER_DIR "PNGJoiner/"
+    CACHE PATH "The path to the PNG joiner sources.")
 set(DISASSEMBLER_DIR "Disassembler/"
     CACHE PATH "The path to the disassembler sources.")
 set(ROM_UNPACKER_DIR "RomUnpacker/"
@@ -56,17 +58,6 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
 endif()
 
-# Configure some legacy CMake behavior ("policies")
-if(POLICY CMP0054)
-    cmake_policy(SET CMP0054 NEW)	# Ignore Quoted Arguments
-endif()
-if(POLICY CMP0072)
-    cmake_policy(SET CMP0072 NEW) # Ignore Legacy GL
-endif()
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW) # Root Variables
-endif()
-
 # -----------------------------------------------------
 #   DEFINE THE PROJECT
 # -----------------------------------------------------
@@ -75,8 +66,8 @@ endif()
 project("Vircon32")
 
 # Define version
-set(PROJECT_VERSION_MAJOR 24)
-set(PROJECT_VERSION_MINOR 8)
+set(PROJECT_VERSION_MAJOR 25)
+set(PROJECT_VERSION_MINOR 1)
 set(PROJECT_VERSION_PATCH 4)
 
 # Set names for final executables
@@ -86,14 +77,14 @@ set(ROM_PACKER_BINARY_NAME "packrom")
 set(PNG_CONVERTER_BINARY_NAME "png2vircon")
 set(WAV_CONVERTER_BINARY_NAME "wav2vircon")
 set(TILED_CONVERTER_BINARY_NAME "tiled2vircon")
+set(PNG_JOINER_BINARY_NAME "joinpngs")
 
 # Set names for reverse tools executables
 set(DISASSEMBLER_BINARY_NAME "disassemble")
 set(ROM_UNPACKER_BINARY_NAME "unpackrom")
 set(PNG_EXTRACTOR_BINARY_NAME "vircon2png")
 set(WAV_EXTRACTOR_BINARY_NAME "vircon2wav")
 
-
 # -----------------------------------------------------
 #   IDENTIFY HOST ENVIRONMENT
 # -----------------------------------------------------
@@ -120,7 +111,7 @@ endif()
 
 # Set compilation flags for C and C++
 if (MINGW OR TARGET_OS STREQUAL "linux")
-    set(cxx_flags "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -Wno-unused-parameter")
+    set(cxx_flags "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter")
     set(c_flags "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
 elseif (MSVC)
     set(cxx_flags "${CMAKE_CXX_FLAGS} /W3 /EHsc /MP /GS /wd4267 /wd4244")
@@ -208,6 +199,7 @@ set(ALL_INCLUDE_DIRS
     ${PNG_CONVERTER_DIR}
     ${WAV_CONVERTER_DIR}
     ${TILED_CONVERTER_DIR}
+    ${PNG_JOINER_DIR}
     ${ROM_PACKER_DIR}
     ${DISASSEMBLER_DIR}
     ${ROM_UNPACKER_DIR}
@@ -250,6 +242,11 @@ set(TILED_CONVERTER_LIBS
     ${TINYXML2_LIBRARY}
     ${CMAKE_DL_LIBS})
 
+# Libraries to link with the PNG joiner
+set(PNG_JOINER_LIBS
+    ${PNG_LIBRARY}
+    ${CMAKE_DL_LIBS})
+
 # -----------------------------------------------------
 #   LINKED LIBRARIES FILES (REVERSE TOOLS)
 # -----------------------------------------------------
@@ -349,6 +346,15 @@ set(TILED_CONVERTER_SRC
     ${TILED_CONVERTER_DIR}/Tiled2Vircon.cpp
     ${INFRASTRUCTURE_DIR}/FilePaths.cpp)
 
+# Source files to compile for the PNG joiner
+set(PNG_JOINER_SRC
+    ${PNG_JOINER_DIR}/Globals.cpp
+    ${PNG_JOINER_DIR}/PNGImage.cpp
+    ${PNG_JOINER_DIR}/PNGJoiner.cpp
+    ${PNG_JOINER_DIR}/RectangleNode.cpp
+    ${INFRASTRUCTURE_DIR}/FilePaths.cpp
+    ${INFRASTRUCTURE_DIR}/StringFunctions.cpp)
+
 # -----------------------------------------------------
 #   SOURCE FILES (REVERSE TOOLS)
 # -----------------------------------------------------
@@ -412,13 +418,18 @@ set_property(TARGET ${WAV_CONVERTER_BINARY_NAME} PROPERTY CXX_STANDARD 11)
 add_executable(${TILED_CONVERTER_BINARY_NAME} ${TILED_CONVERTER_SRC})
 set_property(TARGET ${TILED_CONVERTER_BINARY_NAME} PROPERTY CXX_STANDARD 11)
 
+# this tool needs C++17 for a portable way to iterate over folders
+add_executable(${PNG_JOINER_BINARY_NAME} ${PNG_JOINER_SRC})
+set_property(TARGET ${PNG_JOINER_BINARY_NAME} PROPERTY CXX_STANDARD 17)
+
 # Libraries to link to the C compiler executables
 target_link_libraries(${C_COMPILER_BINARY_NAME} ${C_COMPILER_LIBS})
 target_link_libraries(${ASSEMBLER_BINARY_NAME} ${ASSEMBLER_LIBS})
 target_link_libraries(${ROM_PACKER_BINARY_NAME} ${ROM_PACKER_LIBS})
 target_link_libraries(${PNG_CONVERTER_BINARY_NAME} ${PNG_CONVERTER_LIBS})
 target_link_libraries(${WAV_CONVERTER_BINARY_NAME} ${WAV_CONVERTER_LIBS})
 target_link_libraries(${TILED_CONVERTER_BINARY_NAME} ${TILED_CONVERTER_LIBS})
+target_link_libraries(${PNG_JOINER_BINARY_NAME} ${PNG_JOINER_LIBS})
 
 # -----------------------------------------------------
 #   EXECUTABLES (REVERSE TOOLS)
@@ -456,6 +467,7 @@ if(TARGET_OS STREQUAL "windows")
         ${PNG_CONVERTER_BINARY_NAME}
         ${WAV_CONVERTER_BINARY_NAME}
         ${TILED_CONVERTER_BINARY_NAME}
+        ${PNG_JOINER_BINARY_NAME}
         RUNTIME
         COMPONENT binaries
         DESTINATION DevTools)
@@ -486,6 +498,7 @@ else()
         ${PNG_CONVERTER_BINARY_NAME}
         ${WAV_CONVERTER_BINARY_NAME}
         ${TILED_CONVERTER_BINARY_NAME}
+        ${PNG_JOINER_BINARY_NAME}
         RUNTIME
         COMPONENT binaries
         DESTINATION ${CMAKE_PROJECT_NAME}/DevTools)

DevelopmentTools/Data/Readme.txt

@@ -1,6 +1,6 @@
 ================================================
    PC development tools for Vircon32 console
-  (version 24.8.4). README written by Carra
+  (version 25.1.4). README written by Carra
 ================================================
 
 
@@ -55,6 +55,15 @@ Included programs (build tools)
     into a single file, that will be executable from any
     Vircon32 emulator or implementation.
 
+  - "joinpngs": this tool can take a folder with several PNG
+    images and join them into a single, larger image. For
+    performance this is much better than using a texture for
+    every single small image. This program will also create
+    a project file for the texture region editor (which is
+    distributed separately). From the editor you can then
+    edit region hotspots visually and export C or ASM
+    headers to use the texture in your programs.
+    
 ------------------------------------------------------------
 
 Included programs (reverse tools)
@@ -79,14 +88,31 @@ Included programs (reverse tools)
 
 ------------------------------------------------------------
 
-What's new in version 24.8.4?
+What's new in version 25.1.4?
 
-  - Reverse tools are now included in the dev tools.
-  - On Linux and Mac systems the default installation
-    directory for dev tools has been changed from
-    /opt/Vircon32/DevTools to /usr/local/Vircon32/DevTools.
-  - Along with this, file and folder permissions should
-    now allow the compiler to save logs.
+  - Added new tool: "joinpngs", to join multiple images into
+    a single texture and generate its region editor project.
+  - Because of joinpns, the required C++ version to build
+    the tools from source now changes from C++11 to C++17.
+  - Added new command-line options for debugging to compiler
+    and assembler:
+     - With option -g they will output additional files with
+       debug info for the generated program.
+     - With option --debugmode they will create additional
+       files detailing the result of their internal stages
+       (like the compiler's AST tree).
+  - Added support for character literals in the assembler,
+    using notation 'A', and escaped as '\'' or '\x41'.
+  - Fixed a compiler bug: type consistency was not being
+    checked in declarations of extern variables.
+  - Fixed a typo in compiler's math.h header: in function
+    atan2, the names of the arguments x and y were swapped.
+    However this was just a naming issue. The inner workings
+    of atan2 did not change.
+  - Fixed a bug in wav2vircon: output sound was not always
+    being created correctly if inputs had sample rates
+    different from the default 44100 Hz.
+  - Updated and fixed the assembler tests folder.
 
 ------------------------------------------------------------
 
@@ -96,7 +122,7 @@ License
     under the 3-Clause BSD License, which full text is the
     following:
 
-    Copyright 2021-2024 Carra.
+    Copyright 2021-2025 Carra.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or

DevelopmentTools/Disassembler/Main.cpp

@@ -43,7 +43,7 @@ void PrintUsage()
 
 void PrintVersion()
 {
-    cout << "disassemble v24.8.4" << endl;
+    cout << "disassemble v25.1.4" << endl;
     cout << "Vircon32 disassembler by Javier Carracedo" << endl;
 }
 

DevelopmentTools/PNG2Vircon/png2vircon.cpp

@@ -167,7 +167,7 @@ void PrintUsage()
 
 void PrintVersion()
 {
-    cout << "png2vircon v24.8.4" << endl;
+    cout << "png2vircon v25.1.4" << endl;
     cout << "Vircon32 PNG file importer by Javier Carracedo" << endl;
 }
 

DevelopmentTools/PNG2Vircon/vircon2png.cpp

@@ -188,7 +188,7 @@ void PrintUsage()
 
 void PrintVersion()
 {
-    cout << "vircon2png v24.8.4" << endl;
+    cout << "vircon2png v25.1.4" << endl;
     cout << "Vircon32 PNG file extractor by Javier Carracedo" << endl;
 }