kinfuyuki/allgames
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
kin fuyuki 2025-12-29 14:05:40 -03:00
commit c0ac94529d
No known key found for this signature in database
GPG key ID: 0E4E8E519FB71401
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20)
project(games)
set(CMAKE_CXX_FLAGS "-std=c++17 -Wno-error")
set(CMAKE_CXX_FLAGS "-std=c++17 -Wno-error ")
if(WIN32)
set(PLATFORM_DIR "windows")
else()

8
engine/CMakeLists.txt
View file

@ -6,7 +6,8 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/force_rebuild"
COMMAND rm -f "${CMAKE_SOURCE_DIR}/link/libenginend.so"
COMMAND rm -rf "${CMAKE_SOURCE_DIR}/include/enginend"
)
add_library(enginend SHARED ${ENGINE_SOURCES} "${CMAKE_BINARY_DIR}/force_rebuild")
add_library(enginend SHARED ${ENGINE_SOURCES} "${CMAKE_BINARY_DIR}/force_rebuild"
../include/json.h)
target_link_directories(
enginend PUBLIC
"${CMAKE_SOURCE_DIR}/link")
@ -49,9 +50,10 @@ target_link_libraries(test PRIVATE
)
target_include_directories(test PUBLIC
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include
${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include
)
target_include_directories(enginend PUBLIC
${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include
)

2
engine/src/scenes/scene.h
View file

@ -17,7 +17,7 @@ namespace enginend {
}
virtual void draw() {
ClearBackground(BLANK);
ClearBackground(rl::BLANK);
BeginDrawing();
for (enginend::nodes::node* n : nodes) {
n->draw();

6
games/endlauncher/CMakeLists.txt
View file

@ -12,11 +12,11 @@ target_link_directories(
"${CMAKE_SOURCE_DIR}/link")
target_link_libraries(endlauncher PRIVATE
"${CMAKE_SOURCE_DIR}/link/libenginend.so"
"${CMAKE_SOURCE_DIR}/link/libdesktopraylib.so"
"${CMAKE_SOURCE_DIR}/link/liblinux64raylib.so"
curl zip
)
target_include_directories(endlauncher PUBLIC
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include
${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include
${CMAKE_SOURCE_DIR}/engine/include
)
)

6
games/endlauncher/src/main.cpp
View file

@ -124,7 +124,7 @@ public:
SetConfigFlags(FLAG_WINDOW_UNDECORATED|FLAG_WINDOW_TRANSPARENT|FLAG_WINDOW_TOPMOST);
tiny::error("is transparent lol");
InitWindow(600,300,"test");target=LoadRenderTexture(600, 300);
img=GenImageColor(600, 300, BLANK);
img=GenImageColor(600, 300, rl::BLANK);
SetTargetFPS(GetMonitorRefreshRate(GetCurrentMonitor()));
this->tickrate=GetMonitorRefreshRate(GetCurrentMonitor());
bg=LoadTexture("res/launcher.png");
@ -243,8 +243,8 @@ public:
currentscene->draw();
EndTextureMode();
BeginDrawing();
ClearBackground(BLANK);
DrawTexturePro(target.texture, {0, 0, 600, -300}, {0, 0, 600, 300}, {0, 0}, 0, WHITE);
ClearBackground(rl::BLANK);
DrawTexturePro(target.texture, {0, 0, 600, -300}, {0, 0, 600, 300}, {0, 0}, 0, rl::WHITE);
EndDrawing();
Vector2 mp=Vector2(GetMousePositionDesktop());
Vector2 wp=GetWindowPosition();

2
lib/raylib

@ -1 +1 @@
Subproject commit 5936a41af9da7013b93d6e3c0cd48f07ea8d9782
Subproject commit 5e614e814bf88c22a2f3795358513a700d3a77d0