Compare commits

...

4 Commits

Author SHA1 Message Date
WSAL Evan
ccacb3088f
Merge pull request #20 from StillGreen-san/fix-selected-block-text
fix "Selected Block" text display
2024-11-02 12:09:55 -04:00
StillGreen-san
93897037b8
fix "Selected Block" text display 2024-11-02 11:23:17 +01:00
WSAL Evan
90f1cc59d5
Merge pull request #19 from FoxMoss/main
Update CMake for new files
2024-11-01 21:00:53 -04:00
FoxMoss
b4e22d076b
Update CMake for new files 2024-11-01 16:28:08 -05:00
3 changed files with 3 additions and 2 deletions

View File

@ -511,7 +511,7 @@ int main(int argc, char *argv[])
ImGui::Text("Chunks: %d (%d rendered)", Planet::planet->numChunks, Planet::planet->numChunksRendered);
ImGui::Text("Position: x: %f, y: %f, z: %f", camera.Position.x, camera.Position.y, camera.Position.z);
ImGui::Text("Direction: x: %f, y: %f, z: %f", camera.Front.x, camera.Front.y, camera.Front.z);
ImGui::Text("Selected Block: %s", Blocks::blocks[selectedBlock].blockName);
ImGui::Text("Selected Block: %s", Blocks::blocks[selectedBlock].blockName.c_str());
if (ImGui::SliderInt("Render Distance", &Planet::planet->renderDistance, 0, 30))
Planet::planet->ClearChunkQueue();
if (ImGui::SliderInt("Render Height", &Planet::planet->renderHeight, 0, 10))

View File

@ -23,7 +23,7 @@ namespace Blocks
Block(0, 2, 1, 3, Block::LEAVES, "Leaves"), // Leaves
Block(1, 2, 2, 3, Block::BILLBOARD, "Grass"), // Grass
Block(3, 0, 4, 1, Block::BILLBOARD, "Tall Grass Bot"), // Tall Grass Bottom
Block(3, 0, 4, 1, Block::BILLBOARD, "Tall Grass Bottom"), // Tall Grass Bottom
Block(3, 1, 4, 2, Block::BILLBOARD, "Tall Grass Top"), // Tall Grass Top
Block(0, 3, 1, 4, Block::BILLBOARD, "Poppy"), // Poppy
Block(2, 2, 3, 3, Block::BILLBOARD, "White Tulip"), // White Tulip

View File

@ -1,6 +1,7 @@
add_executable(scuffed_mc
Application.cpp Chunk.cpp Shader.cpp
Block.cpp NoiseSettings.cpp SurfaceFeature.cpp
ChunkData.cpp ChunkPos.cpp Physics.cpp
Camera.cpp Planet.cpp WorldGen.cpp ../vendor/glad.c
)