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
43 changes: 24 additions & 19 deletions examples/loaders/collada_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,41 @@ int main() {
auto ambientLight = AmbientLight::create(0xffffff, 0.2f);
scene->add(ambientLight);


auto dirLight = DirectionalLight::create(0xffffff, 1.0f);
dirLight->position.set(1, 1, 1);
scene->add(dirLight);

ColladaLoader loader;
auto stormTrooper = loader.load(std::string(DATA_FOLDER) + "/models/collada/stormtrooper/stormtrooper.dae");
std::unique_ptr<AnimationMixer> mixer;
auto stormTrooper = loadAsync([&]() -> std::shared_ptr<Group> {
auto model = loader.load(std::string(DATA_FOLDER) + "/models/collada/stormtrooper/stormtrooper.dae");
if (!model) return nullptr;

if (!stormTrooper) {
std::cerr << "Failed to load model\n";
return 1;
}
stormTrooper->rotateZ(math::PI);
scene->add(stormTrooper);
model->rotateZ(math::PI);

Box3 bb;
bb.setFromObject(*stormTrooper);
Box3 bb;
bb.setFromObject(*model);

controls.target = bb.getCenter();
controls.update();
controls.target = bb.getCenter();
controls.update();

std::unique_ptr<AnimationMixer> mixer;
if (!stormTrooper->animations.empty()) {
std::cout << "Loaded " << stormTrooper->animations.size() << " animation clip(s)." << std::endl;
mixer = std::make_unique<AnimationMixer>(*stormTrooper);
mixer->clipAction(stormTrooper->animations.front())->play();
if (!model->animations.empty()) {
std::cout << "Loaded " << model->animations.size() << " animation clip(s)." << std::endl;
mixer = std::make_unique<AnimationMixer>(*model);
mixer->clipAction(model->animations.front())->play();
}

auto skeletonHelper = SkeletonHelper::create(*model);
scene->add(skeletonHelper);
return model;
});

if (!stormTrooper) {
std::cerr << "Failed to load model\n";
return 1;
}

auto skeletonHelper = SkeletonHelper::create(*stormTrooper);
scene->add(skeletonHelper);
scene->add(stormTrooper);

Clock clock;
canvas.animate([&] {
Expand Down
22 changes: 13 additions & 9 deletions examples/loaders/obj_loader.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#include <threepp/loaders/AsyncGroup.hpp>
#include <threepp/threepp.hpp>

using namespace threepp;
Expand Down Expand Up @@ -30,19 +31,22 @@ int main() {
camera->position.set(0, 100, 150);

OBJLoader loader;
auto obj1 = loader.load(std::string(DATA_FOLDER) + "/models/obj/female02/female02.obj");
auto obj1 = loadAsync(loader, std::string(DATA_FOLDER) + "/models/obj/female02/female02.obj");
obj1->position.x = -30;
scene->add(obj1);

TextureLoader tl;
auto tex = tl.load(std::string(DATA_FOLDER) + "/textures/uv_grid_opengl.jpg", ColorSpace::sRGB);
auto obj2 = loader.load(std::string(DATA_FOLDER) + "/models/obj/female02/female02.obj", false);
obj2->position.x = 30;
obj2->traverseType<Mesh>([tex](Mesh& child) {
auto m = MeshPhongMaterial::create();
m->map = tex;
child.setMaterial(m);
auto obj2 = loadAsync([] {
auto tex = TextureLoader().load(std::string(DATA_FOLDER) + "/textures/uv_grid_opengl.jpg", ColorSpace::sRGB);
auto model = OBJLoader().load(std::string(DATA_FOLDER) + "/models/obj/female02/female02.obj", false);
model->traverseType<Mesh>([tex](Mesh& child) {
auto m = MeshPhongMaterial::create();
m->map = tex;
child.setMaterial(m);
});
return model;
});
obj2->position.x = 30;

scene->add(obj2);

createAndAddLights(*scene);
Expand Down
50 changes: 17 additions & 33 deletions examples/projects/Crane3R/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
#include "threepp/threepp.hpp"
#include "utility/Angle.hpp"

#ifndef __EMSCRIPTEN__
#include <future>
#endif

using namespace threepp;
using namespace kine;

Expand Down Expand Up @@ -135,34 +131,28 @@ int main() {
.addLink(Vector3::Z() * 5.2)
.build();

TaskManager tm;

#ifndef __EMSCRIPTEN__
std::shared_ptr<Crane3R> crane;
auto future = std::async([&] {
crane = Crane3R::create();
crane->setTargetValues(asAngles(kine.meanAngles(), Angle::Repr::DEG));
crane->traverseType<Mesh>([](Mesh& m) {
Crane3R* crane = nullptr;
auto craneGroup = loadAsync([&kine]() -> std::shared_ptr<Group> {
auto c = Crane3R::create();
c->setTargetValues(asAngles(kine.meanAngles(), Angle::Repr::DEG));
c->traverseType<Mesh>([](Mesh& m) {
m.castShadow = true;
});

tm.invokeLater([&, crane] {
hud.remove(handle);
scene->add(crane);
endEffectorHelper->visible = true;
});
return c;
});
#else
auto crane = Crane3R::create();
crane->setTargetValues(asAngles(kine.meanAngles(), Angle::Repr::DEG));
crane->traverseType<Mesh>([](Mesh& m) {
m.castShadow = true;

craneGroup->onLoaded([&](AsyncGroup& g) {
for (auto* child : g.children) {
if (auto* c = dynamic_cast<Crane3R*>(child)) {
crane = c;
break;
}
}
hud.remove(handle);
endEffectorHelper->visible = true;
});

hud.remove(handle);
scene->add(crane);
endEffectorHelper->visible = true;
#endif
scene->add(craneGroup);

canvas.onWindowResize([&](WindowSize size) {
camera->aspect = size.aspect();
Expand Down Expand Up @@ -198,8 +188,6 @@ int main() {
canvas.animate([&] {
const auto dt = clock.getDelta();

tm.handleTasks();

transformControls.visible = targetHelper->visible;

renderer->clear();
Expand Down Expand Up @@ -237,8 +225,4 @@ int main() {
hud.render();
}
});

#ifndef __EMSCRIPTEN__
future.get();
#endif
}
50 changes: 26 additions & 24 deletions examples/projects/Youbot/youbot_kine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include "threepp/extras/imgui/ImguiContext.hpp"
#include "threepp/objects/TextSprite.hpp"

#include <future>

using namespace threepp;
using namespace kine;

Expand Down Expand Up @@ -115,31 +113,40 @@ int main() {
HUD hud(*renderer);
hud.add(textHandle).setNormalizedPosition({0.5, 0.5});

TaskManager tm;

std::shared_ptr<Youbot> youbot;
Youbot* youbot = nullptr;
std::unique_ptr<KeyController> keyController;
auto loadFuture = std::async(std::launch::async, [&] {
try {
youbot = Youbot::create(std::string(DATA_FOLDER) + "/models/collada/youbot.dae");
auto youbotGroup = loadAsync([path = std::string(DATA_FOLDER) + "/models/collada/youbot.dae"]() -> std::shared_ptr<Group> {
auto y = Youbot::create(path);
auto wrapper = Group::create();
wrapper->add(std::shared_ptr<Youbot>(y.release()));
return wrapper;
});

youbotGroup->onLoaded([&](AsyncGroup& g) {
g.traverse([&](Object3D& obj) {
if (!youbot) {
if (auto* y = dynamic_cast<Youbot*>(&obj)) {
youbot = y;
}
}
});
if (youbot) {
youbot->add(targetHelper);
youbot->add(endEffectorHelper);
endEffectorHelper->visible = true;
keyController = std::make_unique<KeyController>(*youbot);

tm.invokeLater([&] {
canvas.addKeyListener(*keyController);
scene->add(youbot);
textHandle.setText("Use WASD keys to steer robot");
hud.getStoredOptions(textHandle)->setNormalizedPosition(0, 0).setVerticalAlignment(HUD::VerticalAlignment::ABOVE).setHorizontalAlignment(HUD::HorizontalAlignment::LEFT);
});
} catch (const std::exception& e) {
tm.invokeLater([&, msg = std::string(e.what())] {
textHandle.setText("Error: " + msg);
});
canvas.addKeyListener(*keyController);
textHandle.setText("Use WASD keys to steer robot");
hud.getStoredOptions(textHandle)->setNormalizedPosition(0, 0)
.setVerticalAlignment(HUD::VerticalAlignment::ABOVE)
.setHorizontalAlignment(HUD::HorizontalAlignment::LEFT);
} else {
textHandle.setText("Error loading model");
}
});

scene->add(youbotGroup);

canvas.onWindowResize([&](WindowSize size) {
camera->aspect = size.aspect();
camera->updateProjectionMatrix();
Expand Down Expand Up @@ -173,8 +180,6 @@ int main() {
canvas.animate([&] {
const auto dt = clock.getDelta();

tm.handleTasks();

renderer->clear();
renderer->render(*scene, *camera);

Expand Down Expand Up @@ -206,7 +211,4 @@ int main() {

hud.render();
});

loadFuture.get();

}
5 changes: 4 additions & 1 deletion examples/vulkan/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ add_example(NAME "vulkan_showcase" LINK_IMGUI)
add_example(NAME "vulkan_lights" LINK_IMGUI)
add_example(NAME "vulkan_fog" LINK_IMGUI)
add_example(NAME "vulkan_ocean" LINK_IMGUI)
add_example(NAME "vulkan_bistro" LINK_IMGUI)

if (THREEPP_WITH_FBX)
add_example(NAME "vulkan_bistro" LINK_IMGUI)
endif ()
Loading
Loading