diff --git a/src/MarchingCubeShapeMap.cpp b/src/MarchingCubeShapeMap.cpp index 447d92f..bb17d29 100644 --- a/src/MarchingCubeShapeMap.cpp +++ b/src/MarchingCubeShapeMap.cpp @@ -64,18 +64,78 @@ const std::map MarchingCubeChunkRenderer::RenderMap = { {-1.000000, 0.000000, -0.000000, 0.000000}, {0.000000, 0.000000, 0.000000, 1.000000}), 3}}, - {11, {glm::mat4(0.0f), 0}}, - {12, {glm::mat4(0.0f), 0}}, - {13, {glm::mat4(0.0f), 0}}, - {14, {glm::mat4(0.0f), 0}}, - {15, {glm::mat4(0.0f), 0}}, - {16, {glm::mat4(0.0f), 0}}, - {17, {glm::mat4(0.0f), 0}}, - {18, {glm::mat4(0.0f), 0}}, - {19, {glm::mat4(0.0f), 0}}, - {20, {glm::mat4(0.0f), 0}}, - {21, {glm::mat4(0.0f), 0}}, - {22, {glm::mat4(0.0f), 0}}, + {11, + {glm::mat4({-0.000000, -1.000000, 0.000000, 0.000000}, + {-0.000000, 0.000000, -1.000000, 0.000000}, + {1.000000, -0.000000, -0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 5}}, + {12, + {glm::mat4({-0.000000, 0.000000, 1.000000, 0.000000}, + {0.000000, 1.000000, 0.000000, 0.000000}, + {-1.000000, 0.000000, -0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 2}}, + {13, + {glm::mat4({1.000000, 0.000000, 0.000000, 0.000000}, + {0.000000, -0.000000, -1.000000, 0.000000}, + {0.000000, 1.000000, -0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 5}}, + {14, + {glm::mat4({-0.000000, 1.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, -1.000000, 0.000000}, + {-1.000000, -0.000000, -0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 5}}, + {15, + {glm::mat4({1.000000, 0.000000, 0.000000, 0.000000}, + {0.000000, -0.000000, -1.000000, 0.000000}, + {0.000000, 1.000000, -0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 8}}, + {16, + {glm::mat4({0.000000, 1.000000, -0.000000, 0.000000}, + {1.000000, -0.000000, -0.000000, 0.000000}, + {-0.000000, 0.000000, -1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 1}}, + {17, + {glm::mat4({-1.000000, -0.000000, 0.000000, 0.000000}, + {0.000000, -1.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, 1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 2}}, + {18, + {glm::mat4({-0.000000, 1.000000, 0.000000, 0.000000}, + {-1.000000, -0.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, 1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 3}}, + {19, + {glm::mat4({1.000000, 0.000000, 0.000000, 0.000000}, + {0.000000, -1.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, -1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 5}}, + {20, + {glm::mat4({1.000000, 0.000000, 0.000000, 0.000000}, + {0.000000, 1.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, 1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 4}}, + {21, + {glm::mat4({-0.000000, 1.000000, 0.000000, 0.000000}, + {1.000000, 0.000000, -0.000000, 0.000000}, + {-0.000000, -0.000000, -1.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 6}}, + {22, + {glm::mat4({-0.000000, 0.000000, 1.000000, 0.000000}, + {-1.000000, -0.000000, -0.000000, 0.000000}, + {0.000000, -1.000000, 0.000000, 0.000000}, + {0.000000, 0.000000, 0.000000, 1.000000}), + 6}}, {23, {glm::mat4(0.0f), 0}}, {24, {glm::mat4(0.0f), 0}}, {25, {glm::mat4(0.0f), 0}}, diff --git a/src/main.cpp b/src/main.cpp index d83dbc6..f98bde4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -90,14 +90,22 @@ int main(int argc, char **argv) { Model debugSphere = Model(ROOT_DIR "data/game-models/DebugSphere/DebugSphere.obj"); debugSphere.resize(glm::vec3(0.1f)); - bool index[8] = {false, false, false, false, true, false, true, false}; + bool index[8] = {false, false, false, true, false, true, true, true}; // bool index[8] = {true, true, true, true, true, true, true, true}; - Model debugMCsegment = Model(ROOT_DIR "data/game-models/3/MetalFloor.obj"); + Model debugMCsegment = Model(ROOT_DIR "data/game-models/14/MetalFloor.obj"); // debugMCsegment.worldRotate(180.0f, glm::vec3(1, 0, 1)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(0, 1, 0)); + debugMCsegment.worldRotate(90.0f, glm::vec3(0, 1, 0)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(0, 0, 1)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(0, 0, 1)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(0, 1, 0)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(1, 0, 0)); + // debugMCsegment.worldRotate(-90.0f, glm::vec3(0, 0, 1)); + // debugMCsegment.worldRotate(-90.0f, glm::vec3(0, 1, 0)); + // debugMCsegment.worldRotate(90.0f, glm::vec3(0, 0, 1)); + // debugMCsegment.worldRotate(180.0f, glm::vec3(1, 0, 0)); // debugMCsegment.worldRotate(-90.0f, glm::vec3(0, 1, 0)); - // debugMCsegment.worldRotate(90.0f, glm::vec3(1, 0, 0)); - debugMCsegment.worldRotate(-90.0f, glm::vec3(0, 1, 0)); debugMCsegment.printModel(); // Game loop