refactor

.gitattributes

@@ -1 +1,4 @@
-lib/** linguist-vendored
+*.comp linguist-language=HLSL
+*.frag linguist-language=HLSL
+*.vert linguist-language=HLSL
+lib/** linguist-vendored

.gitignore

@@ -1,2 +1,3 @@
 *.sqlite3
+*.sqlite3-journal
 build

CMakeLists.txt

@@ -10,55 +10,58 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${BINARY_DIR})
 make_directory(${BINARY_DIR})
 
+configure_file(LICENSE.txt ${BINARY_DIR} COPYONLY)
+configure_file(README.md ${BINARY_DIR} COPYONLY)
+configure_file(textures/atlas.png ${BINARY_DIR} COPYONLY)
+
 add_subdirectory(lib/SDL)
 add_executable(blocks WIN32
     lib/sqlite3/sqlite3.c
     lib/stb/stb.c
     src/block.c
+    src/buffer.c
     src/camera.c
-    src/chunk.c
-    src/database.c
-    src/helpers.c
     src/main.c
-    src/noise.c
-    src/pipeline.c
-    src/raycast.c
+    src/map.c
+    src/rand.c
+    src/save.c
+    src/shader.c
     src/voxel.c
     src/world.c
 )
-target_link_libraries(blocks PUBLIC SDL3::SDL3)
+set_target_properties(blocks PROPERTIES C_STANDARD 11)
+target_include_directories(blocks PUBLIC lib/jsmn)
 target_include_directories(blocks PUBLIC lib/sqlite3)
 target_include_directories(blocks PUBLIC lib/stb)
-set_target_properties(blocks PROPERTIES C_STANDARD 11)
+target_link_libraries(blocks PRIVATE SDL3::SDL3)
 
-find_program(GLSLC glslc)
-find_program(SHADERCROSS shadercross)
-function(shader FILE)
-    set(GLSL ${CMAKE_SOURCE_DIR}/shaders/${FILE})
+function(add_shader FILE)
+    set(DEPENDS ${ARGN})
+    set(HLSL ${CMAKE_SOURCE_DIR}/shaders/${FILE})
     set(SPV ${CMAKE_SOURCE_DIR}/shaders/bin/${FILE}.spv)
-    set(DXIL ${CMAKE_SOURCE_DIR}/shaders/bin/${FILE}.dxil)
     set(MSL ${CMAKE_SOURCE_DIR}/shaders/bin/${FILE}.msl)
     set(JSON ${CMAKE_SOURCE_DIR}/shaders/bin/${FILE}.json)
-    function(compile PROGRAM SOURCE OUTPUT)
+    if(MSVC)
+        set(SHADERCROSS lib/SDL_shadercross/msvc/shadercross.exe)
+    endif()
+    function(compile OUTPUT)
         add_custom_command(
             OUTPUT ${OUTPUT}
-            COMMAND ${PROGRAM} ${SOURCE} -o ${OUTPUT} -I src
+            COMMAND ${SHADERCROSS} ${HLSL} -s hlsl -o ${OUTPUT} -I src
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            DEPENDS ${SOURCE} shaders/helpers.glsl src/config.h
-            COMMENT "${SOURCE} -> ${OUTPUT}"
+            DEPENDS ${HLSL} ${DEPENDS}
+            COMMENT ${OUTPUT}
         )
         get_filename_component(NAME ${OUTPUT} NAME)
         string(REPLACE . _ NAME ${NAME})
         set(NAME compile_${NAME})
         add_custom_target(${NAME} DEPENDS ${OUTPUT})
         add_dependencies(blocks ${NAME})
     endfunction()
-    if(EXISTS ${GLSLC} AND EXISTS ${SHADERCROSS})
-        compile(${GLSLC} ${GLSL} ${SPV})
-        compile(${SHADERCROSS} ${SPV} ${MSL})
-        compile(${SHADERCROSS} ${SPV} ${JSON})
-    else()
-        message("Skipping build since dependencies are missing")
+    if (MSVC)
+        compile(${SPV})
+        compile(${MSL})
+        compile(${JSON})
     endif()
     function(package OUTPUT)
         get_filename_component(NAME ${OUTPUT} NAME)
@@ -68,35 +71,33 @@ function(shader FILE)
             COMMAND ${CMAKE_COMMAND} -E copy ${OUTPUT} ${BINARY}
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
             DEPENDS ${OUTPUT}
-            COMMENT "${OUTPUT} -> ${BINARY}"
+            COMMENT ${BINARY}
         )
         string(REPLACE . _ NAME ${NAME})
         set(NAME package_${NAME})
         add_custom_target(${NAME} DEPENDS ${BINARY})
         add_dependencies(blocks ${NAME})
     endfunction()
-    if(NOT APPLE)
-        package(${SPV})
-    else()
+    if(APPLE)
         package(${MSL})
+    else()
+        package(${SPV})
     endif()
+    package(${JSON})
 endfunction()
-shader(composite.frag)
-shader(fullscreen.vert)
-shader(opaque.frag)
-shader(opaque.vert)
-shader(random.frag)
-shader(raycast.frag)
-shader(raycast.vert)
-shader(shadow.frag)
-shader(shadow.vert)
-shader(sky.frag)
-shader(sky.vert)
-shader(ssao.frag)
-shader(transparent.frag)
-shader(transparent.vert)
-shader(ui.frag)
-
-configure_file(LICENSE.txt ${BINARY_DIR} COPYONLY)
-configure_file(README.md ${BINARY_DIR} COPYONLY)
-configure_file(textures/atlas.png ${BINARY_DIR} COPYONLY)
+add_shader(blur.comp shaders/shader.hlsl src/voxel.inc)
+add_shader(composite.comp shaders/shader.hlsl src/voxel.inc)
+add_shader(depth.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(depth.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(opaque.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(opaque.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(raycast.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(raycast.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(shadow.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(shadow.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(sky.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(sky.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(ssao.comp shaders/shader.hlsl src/voxel.inc)
+add_shader(transparent.frag shaders/shader.hlsl src/voxel.inc)
+add_shader(transparent.vert shaders/shader.hlsl src/voxel.inc)
+add_shader(ui.comp shaders/shader.hlsl src/voxel.inc)

README.md

@@ -1,20 +1,18 @@
 # Blocks
 
-![](image.png)
+![](doc/image1.png)
 
-Tiny Minecraft clone in C and GLSL using the new SDL3 GPU API
+Tiny Minecraft clone in C and HLSL using the new SDL3 GPU API
 
 ### Features
 
 - Procedural world generation
-- Parallel chunk loading
-- Blocks and plants
-- Transparency (limited)
-- Deferred rendering
-- Directional shadows
-- SSAO
-- Water depth shading
+- Asynchronous chunk loading
+- Blocks and sprites
 - Persistent worlds
+- Directional shadows
+- Clustered dynamic lighting
+- Basic transparency
 
 ### Building
 
@@ -46,31 +44,58 @@ cd bin
 
 #### Shaders
 
-Shaders have a few dependencies and are prebuilt for your convenience.
-To build locally, install [glslc](https://github.com/google/shaderc) and
-[SDL_shadercross](https://github.com/libsdl-org/SDL_shadercross) to your path
-variable. The build process will automatically use them
+Shaders are prebuilt.
+To build locally, install [glslc](https://github.com/google/shaderc) and [SDL_shadercross](https://github.com/libsdl-org/SDL_shadercross) to your path
 
 ### Controls
 
 - `WASDEQ` to move
 - `Escape` to unfocus
-- `LClick` to break a block
-- `RClick` to place a block
-- `B` to toggle blocks
+- `Left Click` to break a block
+- `Middle Click` to select a block
+- `Right Click` to place a block
+- `Scroll` to change blocks
 - `F11` to toggle fullscreen
 - `LControl` to move quickly
-- `LShift` to move slowly
-
-### Rendering
-
-1. Draw the sky to the g-buffer
-2. Draw the world from the sun's perspective to a depth texture (shadows)
-3. Draw the world (opaque only) to the g-buffer
-4. Calculate SSAO using the g-buffer
-5. Combine the g-buffer, SSAO, and shadows together to create a composite texture
-6. Draw the world (transparent only) with blending to the composite texture
-7. Draw the raycast block to the composite texture
-8. Upscale the composite texture to the swapchain texture
-9. Draw the UI over the swapchain texture
-10. Submit
+
+### Passes
+
+1. Render opaques to depth texture (for shadows)
+
+![](doc/image2.png)
+
+2. Render sky to G-buffer
+
+![](doc/image3.png)
+
+3. Render opaques to G-buffer
+
+![](doc/image4.png)
+
+4. Calculate SSAO
+
+![](doc/image5.png)
+
+5. Blur SSAO
+
+![](doc/image6.png)
+
+6. Composite G-buffer
+
+![](doc/image7.png)
+
+7. Render transparents to depth teture (for predepth)
+
+![](doc/image8.png)
+
+8. Render transparents and composite
+
+![](doc/image9.png)
+
+9. Render raycast
+
+![](doc/image10.png)
+
+10. Render UI
+
+![](doc/image11.png)