Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ imgui.ini
/VoxelEngine-Linux
*.zip
*.gz
EmscriptenPlan.md
/build-web
/emsdk-main
/build-web
/emsdk-main
EmscriptenPlan.md
Binary file added assets/sounds/block_dig/cloth/cloth1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/cloth/cloth2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/cloth/cloth3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/cloth/cloth4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/grass/grass1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/grass/grass2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/grass/grass3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/grass/grass4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/gravel/gravel1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/gravel/gravel2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/gravel/gravel3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/gravel/gravel4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/sand/sand1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/sand/sand2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/sand/sand3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/sand/sand4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/snow/snow1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/snow/snow2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/snow/snow3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/snow/snow4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/stone/stone1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/stone/stone2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/stone/stone3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/stone/stone4.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/wood/wood1.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/wood/wood2.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/wood/wood3.ogg
Binary file not shown.
Binary file added assets/sounds/block_dig/wood/wood4.ogg
Binary file not shown.
Binary file added assets/sounds/damage/fallbig.ogg
Binary file not shown.
Binary file added assets/sounds/damage/fallsmall.ogg
Binary file not shown.
Binary file added assets/sounds/damage/hit1.ogg
Binary file not shown.
Binary file added assets/sounds/damage/hit2.ogg
Binary file not shown.
Binary file added assets/sounds/damage/hit3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/cloth/cloth1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/cloth/cloth2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/cloth/cloth3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/cloth/cloth4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass5.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/grass/grass6.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/gravel/gravel1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/gravel/gravel2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/gravel/gravel3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/gravel/gravel4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/ladder/ladder1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/ladder/ladder2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/ladder/ladder3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/ladder/ladder4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/ladder/ladder5.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/sand/sand1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/sand/sand2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/sand/sand3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/sand/sand4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/sand/sand5.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/snow/snow1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/snow/snow2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/snow/snow3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/snow/snow4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone5.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/stone/stone6.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood1.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood2.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood3.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood4.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood5.ogg
Binary file not shown.
Binary file added assets/sounds/footsteps/wood/wood6.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/lava.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/lavapop.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/splash.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/splash2.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/swim1.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/swim2.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/swim3.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/swim4.ogg
Binary file not shown.
Binary file added assets/sounds/liquid/water.ogg
Binary file not shown.
Binary file added assets/textures/tools/gold_pickaxe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/textures/tools/iron_pickaxe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/textures/tools/stone_pickaxe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/textures/tools/wood_pickaxe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions imgui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Pos=38,36
Size=253,111

[Window][##MainMenu]
Pos=710,320
Pos=1030,513
Size=499,350

[Window][##WorldSelect]
Pos=710,245
Pos=1030,438
Size=500,500

[Window][Debug]
Pos=56,60
Pos=195,71
Size=555,571

[Window][Fun Bullshit]
Expand All @@ -24,22 +24,22 @@ Size=192,167
Collapsed=1

[Window][##PauseMenu]
Pos=785,345
Pos=1105,538
Size=350,300

[Window][Chat]
Pos=20,20
Size=600,200

[Window][##Settings]
Pos=710,245
Pos=1030,438
Size=500,500

[Window][##Inventory]
Pos=696,353
Pos=1016,546
Size=528,284

[Window][##CreativeInventory]
Pos=696,371
Pos=1016,564
Size=528,248

18 changes: 16 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ set(SOURCES
core/WorldSession.cpp
core/Renderer.cpp
rendering/Frustum.cpp
audio/AudioEngine.cpp
audio/stb_vorbis_impl.c
)

include(${CMAKE_SOURCE_DIR}/cmake/embed_resources.cmake)
Expand All @@ -39,6 +41,17 @@ set(_EMBED_CPP "#include \"embedded_assets.h\"\n\n")
set(_TEX "${CMAKE_SOURCE_DIR}/assets/textures")
set(_SHD "${CMAKE_SOURCE_DIR}/src/shaders")

# asset embedding

# tools
embed_asset(embed_diamond_pickaxe_png "${_TEX}/tools/diamond_pickaxe.png")
embed_asset(embed_wood_pickaxe_png "${_TEX}/tools/wood_pickaxe.png")
embed_asset(embed_stone_pickaxe_png "${_TEX}/tools/stone_pickaxe.png")
embed_asset(embed_gold_pickaxe_png "${_TEX}/tools/gold_pickaxe.png")
embed_asset(embed_iron_pickaxe_png "${_TEX}/tools/iron_pickaxe.png")


# blocks
embed_asset(embed_dirt_png "${_TEX}/dirt.png")
embed_asset(embed_grass_top_png "${_TEX}/grass_top.png")
embed_asset(embed_grass_side_snowed_png "${_TEX}/grass_side_snowed.png")
Expand All @@ -56,8 +69,8 @@ embed_asset(embed_leaves_spruce_png "${_TEX}/leaves_spruce.png")
embed_asset(embed_planks_spruce_png "${_TEX}/planks_spruce.png")
embed_asset(embed_snow_png "${_TEX}/snow.png")
embed_asset(embed_grass_side_overlay_png "${_TEX}/grass_side_overlay.png")
embed_asset(embed_diamond_pickaxe_png "${_TEX}/tools/diamond_pickaxe.png")

# misc
embed_asset(embed_destroy_stage_0_png "${_TEX}/destroy/destroy_stage_0.png")
embed_asset(embed_destroy_stage_1_png "${_TEX}/destroy/destroy_stage_1.png")
embed_asset(embed_destroy_stage_2_png "${_TEX}/destroy/destroy_stage_2.png")
Expand All @@ -69,6 +82,7 @@ embed_asset(embed_destroy_stage_7_png "${_TEX}/destroy/destroy_stage_7.png
embed_asset(embed_destroy_stage_8_png "${_TEX}/destroy/destroy_stage_8.png")
embed_asset(embed_destroy_stage_9_png "${_TEX}/destroy/destroy_stage_9.png")

# shaders
embed_asset(embed_default_vert "${_SHD}/default.vert")
embed_asset(embed_default_frag "${_SHD}/default.frag")
embed_asset(embed_selection_vert "${_SHD}/selection.vert")
Expand Down Expand Up @@ -182,7 +196,7 @@ endif()
target_link_libraries(VoxelEngine PRIVATE glm::glm)

if (WIN32)
target_link_libraries(VoxelEngine PRIVATE glad ${GLFW_TARGET} imgui opengl32 zlibstatic)
target_link_libraries(VoxelEngine PRIVATE glad ${GLFW_TARGET} imgui opengl32 zlibstatic ole32 avrt)
target_link_libraries(imgui PRIVATE ${GLFW_TARGET})
else()
target_link_libraries(VoxelEngine PRIVATE glad ${GLFW_TARGET} GL imgui zlibstatic)
Expand Down
Loading