Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-25 20:02:40 +01:00
Code Issues Projects Releases Activity

Update pickup frame position

Browse Source
This commit is contained in:
Daniel Evans 2019-05-13 21:24:18 +01:00
parent a3e924ff3c
commit 8af04b48cf
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rwengine/src/objects/PickupObject.cpp
View File

@ -276,6 +276,7 @@ PickupObject::PickupObject(GameWorld* world, const glm::vec3& position,
auto atomic = modelData->getAtomic(0)->clone();
atomic->setFrame(std::make_shared<ModelFrame>());
setModel(std::move(atomic));
updateTransform(getPosition(), getRotation());
}
PickupObject::~PickupObject() {
@ -318,6 +319,12 @@ void PickupObject::tick(float dt) {
glm::vec4(red / 255.f, green / 255.f, blue / 255.f, 1.f) * colourValue;
if (m_enabled) {
static constexpr float kRotationSpeedCoeff = 3.0f;
updateTransform(
getPosition(),
glm::angleAxis(engine->getGameTime() * kRotationSpeedCoeff,
glm::vec3(0.f, 0.f, 1.f)));
// Sort out interactions with things that may or may not be players.
btManifoldArray manifoldArray;
btBroadphasePairArray& pairArray =

8
rwengine/src/render/ObjectRenderer.cpp
View File

@ -307,14 +307,8 @@ void ObjectRenderer::renderVehicle(VehicleObject* vehicle,
void ObjectRenderer::renderPickup(PickupObject* pickup, RenderList& outList) {
if (!pickup->isEnabled()) return;
static constexpr float kRotationSpeedCoeff = 3.0f;
glm::mat4 modelMatrix =
glm::translate(glm::mat4(1.0f), pickup->getPosition());
modelMatrix = glm::rotate(modelMatrix, m_world->getGameTime() * kRotationSpeedCoeff,
glm::vec3(0.f, 0.f, 1.f));
const auto& atomic = pickup->getAtomic();
renderAtomic(atomic.get(), modelMatrix, nullptr, outList);
renderAtomic(atomic.get(), glm::mat4(1.f), nullptr, outList);
}
void ObjectRenderer::renderCutsceneObject(CutsceneObject* cutscene,