x-ege · Anglebase · Sep 22, 2024 · Sep 28, 2024 · Nov 17, 2024 · Jul 26, 2025
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ build-*
 
 build/
 /temp
-/out
+/out
+/target
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
     "files.associations": {
+        "*.temp": "plaintext",
         "*.cc": "cpp",
         "*.conf": "apacheconf",
         "*.h": "cpp",
@@ -11,7 +12,72 @@
         "*.pch": "objective-cpp",
         "utility": "cpp",
         "random": "cpp",
-        "cstdlib": "cpp"
+        "cstdlib": "cpp",
+        "algorithm": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "exception": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp",
+        "*.rh": "cpp"
     },
     "C_Cpp.errorSquiggles": "disabled",
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,7 +92,7 @@ endif()
 
 add_library(xege STATIC)
 
-target_include_directories(xege PUBLIC include)
+target_include_directories(xege PUBLIC ${PROJECT_SOURCE_DIR}/export)
 
 # 是否使用 libpng 和 zlib 处理 PNG 图片。
 # 目前只能为 ON，未来或允许选择使用 WIC。
@@ -259,7 +259,7 @@ endmacro()
 add_subdirectory(src)
 
 if(EGE_BUILD_DEMO)
-    add_subdirectory(demo)
+    add_subdirectory(examples)
 endif()
 
 if(EGE_BUILD_TEMP AND EXISTS "${PROJECT_SOURCE_DIR}/temp/CMakeLists.txt")

diff --git a/cup.toml b/cup.toml
@@ -0,0 +1,58 @@
+[project]
+name = "xege"
+version = "0.1.0"
+type = "static"
+
+[build]
+# generator = "Ninja"
+# generator = "MinGW Makefiles"
+# generator = "Visual Studio 17 2022"
+jobs = 0
+defines = ["CUP_BUILD"]
+
+[dependencies]
+libpng = { url = "@Anglebase/libpng", version = "0.1.0" }
+
+[tests]
+sources = [
+    "tests/tests/image_generator.cpp",
+    "tests/tests/performance_timer.cpp",
+    "tests/tests/test_framework.cpp",
+]
+includes = ["tests/tests"]
+defines = ["CUP_BUILD"]
+
+[examples]
+defines = ["CUP_BUILD"]
+
+[generator."Visual Studio 17 2022"]
+compile_options = ["/utf-8"]
+[generator."Visual Studio 16 2019"]
+compile_options = ["/utf-8"]
+[generator."Visual Studio 15 2017"]
+compile_options = ["/utf-8"]
+[generator."Visual Studio 14 2015"]
+compile_options = ["/utf-8"]
+
+[generator."MinGW Makefiles"]
+link_libs = [
+    "gdi32",
+    "user32",
+    "kernel32",
+    "gdiplus",
+    "ole32",
+    "oleaut32",
+    "uuid",
+    "winmm",
+]
+[generator."Ninja"]
+link_libs = [
+    "gdi32",
+    "user32",
+    "kernel32",
+    "gdiplus",
+    "ole32",
+    "oleaut32",
+    "uuid",
+    "winmm",
+]
diff --git a/demo/CMakeLists.txt → examples/CMakeLists.txt b/demo/CMakeLists.txt → examples/CMakeLists.txt
diff --git a/demo/README.md → examples/README.md b/demo/README.md → examples/README.md
diff --git a/demo/egelogo.rc → examples/egelogo.rc b/demo/egelogo.rc → examples/egelogo.rc
@@ -1 +1 @@
-EGE_LOGO_JPG JPG "../egelogo.jpg"
+EGE_LOGO_JPG JPG "../egelogo.jpg"
diff --git a/demo/game_gomoku.cpp → examples/game_gomoku.cpp b/demo/game_gomoku.cpp → examples/game_gomoku.cpp
diff --git a/demo/game_snake.cpp → examples/game_snake.cpp b/demo/game_snake.cpp → examples/game_snake.cpp
diff --git a/demo/game_tetris.cpp → examples/game_tetris.cpp b/demo/game_tetris.cpp → examples/game_tetris.cpp
diff --git a/demo/game_type.cpp → examples/game_type.cpp b/demo/game_type.cpp → examples/game_type.cpp
diff --git a/demo/getimage.jpg → examples/getimage.jpg b/demo/getimage.jpg → examples/getimage.jpg
diff --git a/demo/getimage.png → examples/getimage.png b/demo/getimage.png → examples/getimage.png
diff --git a/demo/gmp-demo/MandelbrotSet.cpp → examples/gmp-demo/MandelbrotSet.cpp b/demo/gmp-demo/MandelbrotSet.cpp → examples/gmp-demo/MandelbrotSet.cpp
diff --git a/demo/gmp-demo/MandelbrotSetAni.cpp → examples/gmp-demo/MandelbrotSetAni.cpp b/demo/gmp-demo/MandelbrotSetAni.cpp → examples/gmp-demo/MandelbrotSetAni.cpp
diff --git a/demo/gmp-demo/MandelbrotSetAniLarge.cpp → examples/gmp-demo/MandelbrotSetAniLarge.cpp b/demo/gmp-demo/MandelbrotSetAniLarge.cpp → examples/gmp-demo/MandelbrotSetAniLarge.cpp
diff --git a/demo/graph_5star.cpp → examples/graph_5star.cpp b/demo/graph_5star.cpp → examples/graph_5star.cpp
diff --git a/demo/graph_alpha.cpp → examples/graph_alpha.cpp b/demo/graph_alpha.cpp → examples/graph_alpha.cpp
diff --git a/demo/graph_arrow.cpp → examples/graph_arrow.cpp b/demo/graph_arrow.cpp → examples/graph_arrow.cpp
diff --git a/demo/graph_ball.cpp → examples/graph_ball.cpp b/demo/graph_ball.cpp → examples/graph_ball.cpp
diff --git a/demo/graph_catharine.cpp → examples/graph_catharine.cpp b/demo/graph_catharine.cpp → examples/graph_catharine.cpp
diff --git a/demo/graph_clock.cpp → examples/graph_clock.cpp b/demo/graph_clock.cpp → examples/graph_clock.cpp
diff --git a/demo/graph_function_visualization.cpp → examples/graph_function_visualization.cpp b/demo/graph_function_visualization.cpp → examples/graph_function_visualization.cpp
diff --git a/demo/graph_getimage.cpp → examples/graph_getimage.cpp b/demo/graph_getimage.cpp → examples/graph_getimage.cpp
diff --git a/demo/graph_julia.cpp → examples/graph_julia.cpp b/demo/graph_julia.cpp → examples/graph_julia.cpp
diff --git a/demo/graph_lines.cpp → examples/graph_lines.cpp b/demo/graph_lines.cpp → examples/graph_lines.cpp
diff --git a/demo/graph_mandelbrot.cpp → examples/graph_mandelbrot.cpp b/demo/graph_mandelbrot.cpp → examples/graph_mandelbrot.cpp
diff --git a/demo/graph_mouseball.cpp → examples/graph_mouseball.cpp b/demo/graph_mouseball.cpp → examples/graph_mouseball.cpp
diff --git a/demo/graph_new_drawimage.cpp → examples/graph_new_drawimage.cpp b/demo/graph_new_drawimage.cpp → examples/graph_new_drawimage.cpp
diff --git a/demo/graph_rotateimage.cpp → examples/graph_rotateimage.cpp b/demo/graph_rotateimage.cpp → examples/graph_rotateimage.cpp
diff --git a/demo/graph_rotatetransparent.cpp → examples/graph_rotatetransparent.cpp b/demo/graph_rotatetransparent.cpp → examples/graph_rotatetransparent.cpp
diff --git a/demo/graph_sort_visualization.cpp → examples/graph_sort_visualization.cpp b/demo/graph_sort_visualization.cpp → examples/graph_sort_visualization.cpp
diff --git a/demo/graph_star.cpp → examples/graph_star.cpp b/demo/graph_star.cpp → examples/graph_star.cpp
diff --git a/demo/graph_triangle.cpp → examples/graph_triangle.cpp b/demo/graph_triangle.cpp → examples/graph_triangle.cpp
diff --git a/demo/graph_wave_net.cpp → examples/graph_wave_net.cpp b/demo/graph_wave_net.cpp → examples/graph_wave_net.cpp
diff --git a/demo/test_demo.cpp → examples/test_demo.cpp b/demo/test_demo.cpp → examples/test_demo.cpp
diff --git a/demo/test_doubleclick.cpp → examples/test_doubleclick.cpp b/demo/test_doubleclick.cpp → examples/test_doubleclick.cpp
diff --git a/demo/test_input_demo.cpp → examples/test_input_demo.cpp b/demo/test_input_demo.cpp → examples/test_input_demo.cpp
diff --git a/demo/test_main.cpp → examples/test_main.cpp b/demo/test_main.cpp → examples/test_main.cpp
diff --git a/demo/test_multiplesys_edit.cpp → examples/test_multiplesys_edit.cpp b/demo/test_multiplesys_edit.cpp → examples/test_multiplesys_edit.cpp
diff --git a/demo/test_setviewport.cpp → examples/test_setviewport.cpp b/demo/test_setviewport.cpp → examples/test_setviewport.cpp
diff --git a/demo/tools/buildlogo.cpp → examples/tools/buildlogo.cpp b/demo/tools/buildlogo.cpp → examples/tools/buildlogo.cpp
diff --git a/demo/tools/setup.cpp → examples/tools/setup.cpp b/demo/tools/setup.cpp → examples/tools/setup.cpp
diff --git a/demo/tutorial/tutorial.cpp → examples/tutorial/tutorial.cpp b/demo/tutorial/tutorial.cpp → examples/tutorial/tutorial.cpp
diff --git a/include/ege.h → export/ege.h b/include/ege.h → export/ege.h
@@ -45,13 +45,19 @@
 #   endif
 #endif
 
+#ifdef CUP_BUILD
+#   define _LINK_NAME "xege.lib"
+#else
+#   define _LINK_NAME "graphics.lib"
+#endif
+
 #if !defined(EGE_GRAPH_LIB_BUILD) && !defined(EGE_GRAPH_NO_LIB)
 #   ifdef _MSC_VER
 #       pragma comment(lib,"gdiplus.lib")
 #       ifdef _WIN64 // 64 bit libs
-#           pragma comment(lib,"graphics.lib")
+#           pragma comment(lib,_LINK_NAME)
 #       else   // 32 bit libs
-#           pragma comment(lib,"graphics.lib")
+#           pragma comment(lib,_LINK_NAME)
 #       endif
 #   endif
 #endif

diff --git a/include/ege.zh_CN.h → export/ege.zh_CN.h b/include/ege.zh_CN.h → export/ege.zh_CN.h
diff --git a/include/ege/button.h → export/ege/button.h b/include/ege/button.h → export/ege/button.h
diff --git a/include/ege/egecontrolbase.h → export/ege/egecontrolbase.h b/include/ege/egecontrolbase.h → export/ege/egecontrolbase.h
diff --git a/include/ege/fps.h → export/ege/fps.h b/include/ege/fps.h → export/ege/fps.h
diff --git a/include/ege/label.h → export/ege/label.h b/include/ege/label.h → export/ege/label.h
diff --git a/include/ege/stdint.h → export/ege/stdint.h b/include/ege/stdint.h → export/ege/stdint.h
diff --git a/include/ege/sys_edit.h → export/ege/sys_edit.h b/include/ege/sys_edit.h → export/ege/sys_edit.h
diff --git a/include/ege/types.h → export/ege/types.h b/include/ege/types.h → export/ege/types.h
diff --git a/include/graphics.h → export/graphics.h b/include/graphics.h → export/graphics.h
diff --git a/src/array.h → include/array.h b/src/array.h → include/array.h
diff --git a/src/color.h → include/color.h b/src/color.h → include/color.h
diff --git a/src/console.h → include/console.h b/src/console.h → include/console.h
diff --git a/src/debug.h → include/debug.h b/src/debug.h → include/debug.h
diff --git a/src/ege_base.h → include/ege_base.h b/src/ege_base.h → include/ege_base.h
diff --git a/src/ege_common.h → include/ege_common.h b/src/ege_common.h → include/ege_common.h
diff --git a/src/ege_def.h → include/ege_def.h b/src/ege_def.h → include/ege_def.h
diff --git a/src/ege_dllimport.h → include/ege_dllimport.h b/src/ege_dllimport.h → include/ege_dllimport.h
diff --git a/src/ege_extension.h → include/ege_extension.h b/src/ege_extension.h → include/ege_extension.h
diff --git a/src/ege_graph.h → include/ege_graph.h b/src/ege_graph.h → include/ege_graph.h
diff --git a/src/ege_head.h → include/ege_head.h b/src/ege_head.h → include/ege_head.h
diff --git a/src/ege_math.h → include/ege_math.h b/src/ege_math.h → include/ege_math.h
diff --git a/src/ege_time.h → include/ege_time.h b/src/ege_time.h → include/ege_time.h
diff --git a/src/encodeconv.h → include/encodeconv.h b/src/encodeconv.h → include/encodeconv.h
diff --git a/src/font.h → include/font.h b/src/font.h → include/font.h
diff --git a/src/gdi_conv.h → include/gdi_conv.h b/src/gdi_conv.h → include/gdi_conv.h
diff --git a/src/image.h → include/image.h b/src/image.h → include/image.h
diff --git a/src/keyboard.h → include/keyboard.h b/src/keyboard.h → include/keyboard.h
diff --git a/src/message.h → include/message.h b/src/message.h → include/message.h
diff --git a/src/mouse.h → include/mouse.h b/src/mouse.h → include/mouse.h
diff --git a/src/music.h → include/music.h b/src/music.h → include/music.h
diff --git a/src/sbt.h → include/sbt.h b/src/sbt.h → include/sbt.h
diff --git a/src/set.h → include/set.h b/src/set.h → include/set.h
diff --git a/src/thread_queue.h → include/thread_queue.h b/src/thread_queue.h → include/thread_queue.h
diff --git a/src/utils.h → include/utils.h b/src/utils.h → include/utils.h
diff --git a/src/window.h → include/window.h b/src/window.h → include/window.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,6 +4,10 @@ target_sources(xege
     PRIVATE ${EGE_CPP_SRC}
 )
 
+target_include_directories(xege
+    PRIVATE ${PROJECT_SOURCE_DIR}/include
+)
+
 target_include_directories(xege
     PRIVATE lpng
 )

diff --git a/src/compress.cpp b/src/compress.cpp
@@ -1,6 +1,9 @@
 #include "ege_head.h"
+#ifdef CUP_BUILD
+#include "zlib/zlib.h"
+#else
 #include <zlib.h>
-
+#endif
 namespace ege
 {
 

diff --git a/src/image.cpp b/src/image.cpp
@@ -22,8 +22,11 @@
 // #undef _ITERATOR_DEBUG_LEVEL
 // #endif
 
+#ifdef CUP_BUILD
+#include "libpng/png.h"
+#else
 #include <png.h>
-
+#endif
 
 #include <math.h>
 #include <limits.h>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,133 +1 @@
-# 包含EGE头文件目录
-include_directories(../include)
-
-# 添加编译定义
-add_definitions(-DSHOW_CONSOLE=1)
-add_definitions(-DEGE_GRAPH_NO_LIB)
-add_definitions(-DNOMINMAX)
-
-# 添加Windows系统库
-set(SYSTEM_LIBS
-    gdi32
-    user32
-    kernel32
-    gdiplus
-    ole32
-    oleaut32
-    uuid
-    winmm
-)
-
-# 创建测试工具库
-add_library(test_framework STATIC
-    test_framework.cpp
-    test_framework.h
-    image_generator.cpp
-    image_generator.h
-    performance_timer.cpp
-    performance_timer.h
-)
-
-target_link_libraries(test_framework ${SYSTEM_LIBS})
-
-if(MSVC)
-    target_compile_options(test_framework PUBLIC
-        /source-charset:utf-8
-        /Zc:__cplusplus
-    )
-endif()
-
-# 主性能测试程序
-add_executable(putimage_performance_test
-    tests/putimage_performance_test.cpp
-)
-
-target_link_libraries(putimage_performance_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-# 单独的测试用例
-add_executable(putimage_basic_test
-    tests/putimage_basic_test.cpp
-)
-
-target_link_libraries(putimage_basic_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-add_executable(putimage_alphablend_test
-    tests/putimage_alphablend_test.cpp
-)
-
-target_link_libraries(putimage_alphablend_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-add_executable(putimage_transparent_test
-    tests/putimage_transparent_test.cpp
-)
-
-target_link_libraries(putimage_transparent_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-add_executable(putimage_rotate_test
-    tests/putimage_rotate_test.cpp
-)
-
-target_link_libraries(putimage_rotate_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-add_executable(putimage_comparison_test
-    tests/putimage_comparison_test.cpp
-)
-
-target_link_libraries(putimage_comparison_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-add_executable(putimage_alphablend_comprehensive_test
-    tests/putimage_alphablend_comprehensive_test.cpp
-)
-
-target_link_libraries(putimage_alphablend_comprehensive_test
-    test_framework
-    xege
-    ${SYSTEM_LIBS}
-)
-
-# 设置输出目录
-set_target_properties(
-    putimage_performance_test
-    putimage_basic_test
-    putimage_alphablend_test
-    putimage_transparent_test
-    putimage_rotate_test
-    putimage_comparison_test
-    putimage_alphablend_comprehensive_test
-    PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
-
-# 创建测试目标
-enable_testing()
-add_test(NAME putimage_performance COMMAND putimage_performance_test)
-add_test(NAME putimage_basic COMMAND putimage_basic_test)
-add_test(NAME putimage_alphablend COMMAND putimage_alphablend_test)
-add_test(NAME putimage_transparent COMMAND putimage_transparent_test)
-add_test(NAME putimage_rotate COMMAND putimage_rotate_test)
-add_test(NAME putimage_comparison COMMAND putimage_comparison_test)
-add_test(NAME putimage_alphablend_comprehensive COMMAND putimage_alphablend_comprehensive_test)
+add_subdirectory(tests)
diff --git a/...utimage_alphablend_comprehensive_test.cpp → ...utimage_alphablend_comprehensive_test.cpp b/...utimage_alphablend_comprehensive_test.cpp → ...utimage_alphablend_comprehensive_test.cpp
@@ -27,10 +27,11 @@
  */
 
 #define SHOW_CONSOLE 1
+#define NOMINMAX 1
 #include "ege.h"
-#include "../image_generator.h"
-#include "../performance_timer.h" 
-#include "../test_framework.h"
+#include "image_generator.h"
+#include "performance_timer.h" 
+#include "test_framework.h"
 
 #include <iostream>
 #include <iomanip>

diff --git a/tests/tests/putimage_alphablend_test.cpp → tests/putimage_alphablend_test.cpp b/tests/tests/putimage_alphablend_test.cpp → tests/putimage_alphablend_test.cpp
@@ -8,9 +8,9 @@
  */
 
 #define SHOW_CONSOLE 1
-#include "../image_generator.h"
-#include "../performance_timer.h"
-#include "../test_framework.h"
+#include "image_generator.h"
+#include "performance_timer.h"
+#include "test_framework.h"
 #include "ege.h"
 
 #include <functional>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,5 @@ build-* @@
     build/
     /temp
-    /out
+    /out
+    /target
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		EGE_LOGO_JPG JPG "../egelogo.jpg"
		EGE_LOGO_JPG JPG "../egelogo.jpg"