Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
c0ac94529d
6 changed files with 14 additions and 12 deletions
|
|
@ -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
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue