Cleanup and use strings for files.
This commit is contained in:
kidrigger
parent
ec1fc0570d
commit
12ab256a30
|
|
@ -1,5 +0,0 @@
|
|||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:Boolean x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark5/@KeyIndexDefined">True</s:Boolean>
|
||||
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark5/Coords/@EntryValue">(Doc Ln 10 Col 4)</s:String>
|
||||
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark5/FileId/@EntryValue">DB94C55F-6B9A-4AAE-80D7-29FD8153E6B5/d:aster/f:window.h</s:String>
|
||||
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark5/Owner/@EntryValue">NumberedBookmarkManager</s:String></wpf:ResourceDictionary>
|
||||
|
|
@ -11,31 +11,34 @@ find_package(VulkanMemoryAllocator CONFIG REQUIRED)
|
|||
find_package(EASTL CONFIG REQUIRED)
|
||||
|
||||
set(HEADER_FILES
|
||||
constants.h
|
||||
config.h
|
||||
logger.h
|
||||
global.h
|
||||
context.h
|
||||
window.h
|
||||
physical_device.h
|
||||
device.h
|
||||
swapchain.h
|
||||
pipeline.h
|
||||
queue_allocation.h
|
||||
buffer.h "surface.h" "size.h")
|
||||
"constants.h"
|
||||
"config.h"
|
||||
"logger.h"
|
||||
"global.h"
|
||||
"context.h"
|
||||
"window.h"
|
||||
"physical_device.h"
|
||||
"device.h"
|
||||
"swapchain.h"
|
||||
"pipeline.h"
|
||||
"queue_allocation.h"
|
||||
"buffer.h"
|
||||
"image.h"
|
||||
"surface.h"
|
||||
"size.h")
|
||||
|
||||
set(SOURCE_FILES
|
||||
logger.cpp
|
||||
global.cpp
|
||||
context.cpp
|
||||
window.cpp
|
||||
physical_device.cpp
|
||||
device.cpp
|
||||
swapchain.cpp
|
||||
pipeline.cpp
|
||||
buffer.cpp
|
||||
image.cpp
|
||||
image.h "surface.cpp")
|
||||
"logger.cpp"
|
||||
"global.cpp"
|
||||
"context.cpp"
|
||||
"window.cpp"
|
||||
"physical_device.cpp"
|
||||
"device.cpp"
|
||||
"swapchain.cpp"
|
||||
"pipeline.cpp"
|
||||
"buffer.cpp"
|
||||
"image.cpp"
|
||||
"surface.cpp")
|
||||
|
||||
add_library(aster_core STATIC ${SOURCE_FILES} ${HEADER_FILES})
|
||||
set_property(TARGET aster_core PROPERTY CXX_STANDARD 20)
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
add_executable(triangle triangle.cpp)
|
||||
add_shader(triangle shader/triangle.vert.glsl)
|
||||
add_shader(triangle shader/triangle.frag.glsl)
|
||||
add_executable(triangle "triangle.cpp")
|
||||
add_shader(triangle "shader/triangle.vert.glsl")
|
||||
add_shader(triangle "shader/triangle.frag.glsl")
|
||||
|
||||
target_link_libraries(triangle PRIVATE aster_core)
|
||||
target_link_libraries(triangle PRIVATE util_helper)
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ cmake_minimum_required(VERSION 3.13)
|
|||
|
||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address")
|
||||
|
||||
add_executable(box box.cpp stb_image.h)
|
||||
add_shader(box shader/box.vert.glsl)
|
||||
add_shader(box shader/box.frag.glsl)
|
||||
add_executable(box "box.cpp" "stb_image.h")
|
||||
add_shader(box "shader/box.vert.glsl")
|
||||
add_shader(box "shader/box.frag.glsl")
|
||||
|
||||
target_link_libraries(box PRIVATE aster_core)
|
||||
target_link_libraries(box PRIVATE util_helper)
|
||||
|
||||
add_resource_dir(box image)
|
||||
add_resource_dir(box image)
|
||||
|
|
|
|||
|
|
@ -5,28 +5,28 @@ cmake_minimum_required(VERSION 3.13)
|
|||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address")
|
||||
find_path(TINYGLTF_INCLUDE_DIRS "tiny_gltf.h")
|
||||
|
||||
add_executable(model_render model_render.cpp
|
||||
pipeline_utils.cpp
|
||||
pipeline_utils.h
|
||||
asset_loader.cpp
|
||||
asset_loader.h
|
||||
light_manager.cpp
|
||||
light_manager.h
|
||||
gpu_resource_manager.cpp
|
||||
gpu_resource_manager.h
|
||||
nodes.cpp
|
||||
nodes.h
|
||||
ibl_helpers.cpp
|
||||
ibl_helpers.h)
|
||||
add_executable(model_render "model_render.cpp"
|
||||
"pipeline_utils.cpp"
|
||||
"pipeline_utils.h"
|
||||
"asset_loader.cpp"
|
||||
"asset_loader.h"
|
||||
"light_manager.cpp "
|
||||
"light_manager.h"
|
||||
"gpu_resource_manager.cpp"
|
||||
"gpu_resource_manager.h"
|
||||
"nodes.cpp"
|
||||
"nodes.h"
|
||||
"ibl_helpers.cpp"
|
||||
"ibl_helpers.h")
|
||||
|
||||
add_shader(model_render shader/model.vs.hlsl)
|
||||
add_shader(model_render shader/model.ps.hlsl)
|
||||
add_shader(model_render shader/eqrect_to_cube.cs.hlsl)
|
||||
add_shader(model_render shader/background.vs.hlsl)
|
||||
add_shader(model_render shader/background.ps.hlsl)
|
||||
add_shader(model_render shader/diffuse_irradiance.cs.hlsl)
|
||||
add_shader(model_render shader/prefilter.cs.hlsl)
|
||||
add_shader(model_render shader/brdf_lut.cs.hlsl)
|
||||
add_shader(model_render "shader/model.vs.hlsl")
|
||||
add_shader(model_render "shader/model.ps.hlsl")
|
||||
add_shader(model_render "shader/eqrect_to_cube.cs.hlsl")
|
||||
add_shader(model_render "shader/background.vs.hlsl")
|
||||
add_shader(model_render "shader/background.ps.hlsl")
|
||||
add_shader(model_render "shader/diffuse_irradiance.cs.hlsl")
|
||||
add_shader(model_render "shader/prefilter.cs.hlsl")
|
||||
add_shader(model_render "shader/brdf_lut.cs.hlsl")
|
||||
|
||||
target_link_libraries(model_render PRIVATE aster_core)
|
||||
target_link_libraries(model_render PRIVATE util_helper)
|
||||
|
|
|
|||
|
|
@ -7,24 +7,24 @@ find_path(TINYGLTF_INCLUDE_DIRS "tiny_gltf.h")
|
|||
|
||||
find_package(EnTT REQUIRED CONFIG)
|
||||
|
||||
add_executable(scene_render main.cpp
|
||||
render_resource_manager.cpp render_resource_manager.h
|
||||
asset_loader.cpp asset_loader.h
|
||||
pipeline_utils.cpp pipeline_utils.h
|
||||
core_components.h
|
||||
ecs_adapter.h
|
||||
camera.h
|
||||
ibl_helpers.cpp ibl_helpers.h
|
||||
light_manager.cpp light_manager.h)
|
||||
add_executable(scene_render "main.cpp"
|
||||
"render_resource_manager.cpp" "render_resource_manager.h"
|
||||
"asset_loader.cpp" "asset_loader.h"
|
||||
"pipeline_utils.cpp" "pipeline_utils.h"
|
||||
"core_components.h"
|
||||
"ecs_adapter.h"
|
||||
"camera.h"
|
||||
"ibl_helpers.cpp" "ibl_helpers.h"
|
||||
"light_manager.cpp" "light_manager.h")
|
||||
|
||||
add_shader(scene_render shader/model.frag.glsl)
|
||||
add_shader(scene_render shader/model.vert.glsl)
|
||||
add_shader(scene_render shader/eqrect_to_cube.cs.hlsl)
|
||||
add_shader(scene_render shader/diffuse_irradiance.cs.hlsl)
|
||||
add_shader(scene_render shader/prefilter.cs.hlsl)
|
||||
add_shader(scene_render shader/brdf_lut.cs.hlsl)
|
||||
add_shader(scene_render shader/background.vert.glsl)
|
||||
add_shader(scene_render shader/background.frag.glsl)
|
||||
add_shader(scene_render "shader/model.frag.glsl")
|
||||
add_shader(scene_render "shader/model.vert.glsl")
|
||||
add_shader(scene_render "shader/eqrect_to_cube.cs.hlsl")
|
||||
add_shader(scene_render "shader/diffuse_irradiance.cs.hlsl")
|
||||
add_shader(scene_render "shader/prefilter.cs.hlsl")
|
||||
add_shader(scene_render "shader/brdf_lut.cs.hlsl")
|
||||
add_shader(scene_render "shader/background.vert.glsl")
|
||||
add_shader(scene_render "shader/background.frag.glsl")
|
||||
|
||||
target_link_libraries(scene_render PRIVATE aster_core)
|
||||
target_link_libraries(scene_render PRIVATE util_helper)
|
||||
|
|
|
|||
Loading…
Reference in New Issue