From 2e7fe9879b29d646b417fc691d07de3a4d6c8a2c Mon Sep 17 00:00:00 2001 From: ArgonarioD Date: Thu, 20 Apr 2023 13:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E7=BD=AE=E4=BA=86=E6=89=8B=E9=9B=B7?= =?UTF-8?q?=E6=8A=95=E6=8E=B7=E5=85=B5=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ToyEngine/src/DemoWorld.cpp | 6 +++--- ToyEngine/src/MainWindow.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ToyEngine/src/DemoWorld.cpp b/ToyEngine/src/DemoWorld.cpp index 9d862cf..a58306a 100644 --- a/ToyEngine/src/DemoWorld.cpp +++ b/ToyEngine/src/DemoWorld.cpp @@ -25,8 +25,8 @@ DemoWorld::DemoWorld() shoot->setScale(glm::vec3(45)); throwPerson = std::make_shared("Models\\grenade_throw\\grenade_throw.gltf"); - throwPerson->setPosition({ -7,0,-1 }); - throwPerson->setRotaion(glm::angleAxis(glm::radians(90.f), glm::vec3(0, 1, 0))); + throwPerson->setPosition({ 0.25,6.8,-8.1 }); + //throwPerson->setRotaion(glm::angleAxis(glm::radians(90.f), glm::vec3(0, 1, 0))); throwPerson->setScale(glm::vec3{ 45 }); mk2 = std::make_shared(10, "Models\\mk2-frag-grenade\\mk2-frag-grenade.gltf"); @@ -93,7 +93,7 @@ void DemoWorld::logicalTick(float deltaTime) if (abs(throwPerson->getAnimatorCurrentTime() - 3.41f) < 1e-2f) { mk2->setPosition(throwPerson->getPosition() + glm::vec3(-0.5, 2.2, 0)); - mk2->setSpeed(glm::mat3_cast(throwPerson->getRotation() * glm::rotation(glm::vec3(1, 0, 0), glm::normalize(glm::vec3(0, 1, 1)/*方向*/))) * glm::vec3(15/*速度*/, 0, 0)); + mk2->setSpeed(glm::mat3_cast(throwPerson->getRotation() * glm::rotation(glm::vec3(1, 0, 0), glm::normalize(glm::vec3(0, 0.8, 1)/*方向*/))) * glm::vec3(8.3/*速度*/, 0, 0)); mk2->setEnableGravity(true); } } diff --git a/ToyEngine/src/MainWindow.cpp b/ToyEngine/src/MainWindow.cpp index 9c83b0f..4f710f7 100644 --- a/ToyEngine/src/MainWindow.cpp +++ b/ToyEngine/src/MainWindow.cpp @@ -126,7 +126,7 @@ int MainWindow::exec() if (accTime > 1.) { std::cout << std::format("{:20}\r", ""); - std::cout << std::format("FPS: {:.2f} TPS: {:.2f}\r", frameCnt / accTime, logicalTickCount / accTime); + std::cout << std::format("FPS: {:.2f} TPS: {:.2f} {} {} {}\r", frameCnt / accTime, logicalTickCount / accTime, camera.Position.x, camera.Position.y, camera.Position.z); accTime = 0; frameCnt = 0; logicalTickCount = 0;