Merge branch 'main' of http://101.34.228.45:3000/wuyize/ToyEngine
commit
e0a4c25242
|
@ -21,7 +21,8 @@ DemoWorld::DemoWorld()
|
||||||
auto sponza = std::make_shared<Actor>("Models\\Sponza\\Sponza.gltf");
|
auto sponza = std::make_shared<Actor>("Models\\Sponza\\Sponza.gltf");
|
||||||
sponza->setScale(glm::vec3(2));
|
sponza->setScale(glm::vec3(2));
|
||||||
auto shoot = std::make_shared<Actor>("Models\\shoot_gun\\scene.gltf");
|
auto shoot = std::make_shared<Actor>("Models\\shoot_gun\\scene.gltf");
|
||||||
shoot->setPosition({ 5,0,-1 });
|
shoot->setPosition({ 0.25,6.8,7.8 });
|
||||||
|
shoot->setRotaion(glm::angleAxis(glm::radians(90.f), glm::vec3(0, 1, 0)));
|
||||||
shoot->setScale(glm::vec3(45));
|
shoot->setScale(glm::vec3(45));
|
||||||
|
|
||||||
throwPerson = std::make_shared<Actor>("Models\\grenade_throw\\grenade_throw.gltf");
|
throwPerson = std::make_shared<Actor>("Models\\grenade_throw\\grenade_throw.gltf");
|
||||||
|
|
Loading…
Reference in New Issue