Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skeleton: bump imgui to 1.83

Browse Source
This commit is contained in:
Anonymous Maarten
2021-07-08 16:09:40 +02:00
parent 2e25c0ec10
commit 20f744c0df
30 changed files with 38322 additions and 15520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/camera/CMakeLists.txt
View File

@ -12,6 +12,7 @@ target_link_libraries(camera
add_custom_command(
TARGET camera POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:camera>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:camera>/files"
)

4
tools/camera/main.cpp
View File

@ -298,6 +298,8 @@ MainCameraRender(rw::Camera *camera)
ImGui::EndFrame();
ImGui::Render();
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
camera->endUpdate();
@ -321,6 +323,8 @@ SubCameraRender(rw::Camera *camera)
ImGui::EndFrame();
ImGui::Render();
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
camera->endUpdate();
}

1
tools/im2d/CMakeLists.txt
View File

@ -16,6 +16,7 @@ target_link_libraries(im2d
add_custom_command(
TARGET im2d POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:im2d>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:im2d>/files"
)

2
tools/im2d/main.cpp
View File

@ -148,6 +148,8 @@ Render(void)
ImGui::EndFrame();
ImGui::Render();
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
Camera->endUpdate();
Camera->showRaster(0);

3
tools/im3d/CMakeLists.txt
View File

@ -16,7 +16,8 @@ target_link_libraries(im3d
add_custom_command(
TARGET im3d POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:im3d>/files"
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:im3d>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:im3d>/files"
)
librw_platform_target(im3d)

2
tools/im3d/main.cpp
View File

@ -155,6 +155,8 @@ Render(void)
ImGui::EndFrame();
ImGui::Render();
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
Camera->endUpdate();
Camera->showRaster(0);

3
tools/imguitest/main.cpp
View File

@ -109,10 +109,13 @@ Draw(float timeDelta)
ImGui::EndFrame();
ImGui::Render();
Scene.camera->endUpdate();
Scene.camera->showRaster(0);
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
}

1
tools/lights/CMakeLists.txt
View File

@ -11,6 +11,7 @@ target_link_libraries(lights
add_custom_command(
TARGET lights POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:lights>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/checker.dff" "$<TARGET_FILE_DIR:lights>"
)

2
tools/lights/main.cpp
View File

@ -264,6 +264,8 @@ Render(float timeDelta)
ImGui::EndFrame();
ImGui::Render();
ImGui_ImplRW_RenderDrawLists(ImGui::GetDrawData());
Camera->endUpdate();
Camera->showRaster(0);
}

1
tools/playground/CMakeLists.txt
View File

@ -15,6 +15,7 @@ target_link_libraries(playground
add_custom_command(
TARGET playground POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:playground>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:playground>/files"
)

5
tools/subrast/CMakeLists.txt
View File

@ -1,5 +1,7 @@
add_executable(subrast WIN32
main.cpp subrast.cpp
main.cpp
subrast.cpp
subrast.h
)
target_link_libraries(subrast
@ -10,6 +12,7 @@ target_link_libraries(subrast
add_custom_command(
TARGET subrast POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:subrast>/files"
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:subrast>/files"
)

4
tools/subrast/main.cpp
View File

@ -129,9 +129,11 @@ Initialize3D(void)
AmbientLight = CreateAmbientLight(World);
MainLight = CreateMainLight(World);
Clump = CreateClump(World);
if (Clump == nil)
return false;
CreateCameras(World);
UpdateSubRasters(Camera, sk::globals.width, sk::globals.height);
UpdateSubRasters(Camera, sk::globals.width, sk::globals.height);
rw::SetRenderState(rw::CULLMODE, rw::CULLBACK);
rw::SetRenderState(rw::ZTESTENABLE, 1);