Skip to content
Snippets Groups Projects

Feature/#459 default primitives

Open Jan Delember requested to merge feature/#459_default_primitives into master
4 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
85 87 auto handle = std::async([&right_interaction_behavior, &scene,
86 88 rendering_system, splash, input_system,
87 89 openvr_system]() {
88 auto model_surface_entity = phx::SceneLoader::InsertModelIntoScene(
89 "models/combustion/mixture_surface_0.2_lower.stl", scene.get());
90 auto model_surface_entity =
91 phx::SceneLoader::InsertModelIntoScene("models/bunny.obj", scene.get());
  • 125 127 vis_root_transform->SetLocalScale(glm::vec3(0.001f, 0.001f, 0.001f));
    126 128 vis_root_transform->SetLocalTranslation(glm::vec3(-0.4f, 0.02f, -0.25f));
    127 129
    128 auto floor_entity = phx::SceneLoader::InsertModelIntoScene(
    129 "models/cube/cube.obj", scene.get());
    130 auto floor_transform = floor_entity->GetFirstComponent<phx::Transform>();
    131 floor_transform->SetLocalScale(glm::vec3(1000.0f, 0.05f, 1000.0f));
    132 auto floor_material = floor_transform->GetChild(0)
    133 ->GetEntity()
    134 ->GetFirstComponent<phx::MaterialHandle>();
    135 floor_material->GetMaterial()->SetDiffuseColor(glm::vec3(0.5f, 0.5f, 0.5f));
    136 floor_material->GetMaterial()->SetSpecularColor(
    137 glm::vec3(1.0f, 1.0f, 1.0f));
    138 floor_material->GetMaterial()->SetAmbientColor(glm::vec3(0.1f, 0.1f, 0.1f));
    130 auto floor_resource =
    131 phx::ResourceUtils::LoadBox("box", glm::vec3(5.0f, 0.5f, 5.0f));
    • For the wireframe also one of the generated boxes can be used, right? So maybe also replace that one, where currently still models/combustion/data_box.stl is used.

      By Jonathan Ehret on 2018-08-09T06:56:32 (imported from GitLab)

    • Maybe we should also have an integration test, to see whether a generic box with a generic material (including a texture) is rendered correctly only checking whether the number of coordinates, indices etc. is correct does not seem sufficient to me...

      By Jonathan Ehret on 2018-08-09T07:00:25 (imported from GitLab)

  • Please register or sign in to reply
    Loading