WIP: bugfixing
This commit is contained in:
@@ -25,9 +25,9 @@ int main() {
|
||||
acidrain::texture_generator tg(256, 256);
|
||||
tg.brick(0, 50, 20, 4, glm::vec4(1), glm::vec4(0));
|
||||
|
||||
shared_ptr<mesh> affectedSphere = mesh_generator::sphere(10, 10);
|
||||
// map_transform(affectedSphere, tg, 0, 0, 1.2f);
|
||||
// calculate_normals(*affectedSphere.get());
|
||||
shared_ptr<mesh> affectedSphere = mesh_generator::sphere(50, 50);
|
||||
map_transform(affectedSphere, tg, 0, 0, 1.2f);
|
||||
calculate_normals(*affectedSphere.get());
|
||||
|
||||
// affectedSphere = mesh_generator::cog(0.2, 0.5, 50, 4, 0.1, 0.2, 0.2, 0.1);
|
||||
|
||||
@@ -125,12 +125,12 @@ int main() {
|
||||
ground_plane->scale = glm::vec3(10);
|
||||
ground_plane->rotation = glm::angleAxis(3.141529f / 2.0f, glm::vec3(1.0f, 0.0f, 0.0f));
|
||||
|
||||
auto black_plane = std::make_shared<mesh_node>("back plane");
|
||||
black_plane->mesh_ = demo_data::meshes[2];
|
||||
black_plane->material_ = demo_data::materials[1];
|
||||
black_plane->position = glm::vec3(0, 5, -5);
|
||||
black_plane->scale = glm::vec3(10);
|
||||
black_plane->rotation = angleAxis(3.141529f, glm::vec3(1.0f, 0.0f, 0.0f));
|
||||
auto back_plane = std::make_shared<mesh_node>("back plane");
|
||||
back_plane->mesh_ = demo_data::meshes[2];
|
||||
back_plane->material_ = demo_data::materials[1];
|
||||
back_plane->position = glm::vec3(0, 5, -5);
|
||||
back_plane->scale = glm::vec3(10);
|
||||
back_plane->rotation = angleAxis(3.141529f, glm::vec3(1.0f, 0.0f, 0.0f));
|
||||
|
||||
auto left_plane = std::make_shared<mesh_node>("left plane");
|
||||
left_plane->mesh_ = demo_data::meshes[2];
|
||||
@@ -187,7 +187,7 @@ int main() {
|
||||
lightNode2->specular = glm::vec4(0.0, 0.8, 0.1, 1.0);
|
||||
|
||||
scene1->tree->add(ground_plane);
|
||||
scene1->tree->add(black_plane);
|
||||
scene1->tree->add(back_plane);
|
||||
scene1->tree->add(left_plane);
|
||||
scene1->tree->add(right_plane);
|
||||
|
||||
@@ -210,7 +210,7 @@ int main() {
|
||||
timer timer1;
|
||||
while (!peripherals.should_close() && timer1.seconds_since_start() < DEMO_LENGTH_IN_SECONDS) {
|
||||
double elapsedSeconds = timer1.seconds_since_start();
|
||||
|
||||
LOG(INFO) << "frame start";
|
||||
bigSphere->mesh_ = mesh_generator::extrude(mesh_generator::sphere(50, 50), {200, 201, 100, 101, 400, 401}, 0.05,
|
||||
(int) ((sin(elapsedSeconds) + 0.5) * 40));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user