libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: renamed stuff to match original source

Browse Source
This commit is contained in:
Martin Gerhardy 2023-01-17 06:59:18 +01:00
parent aaa7645a52
commit 4e0a29d61d
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/twine/holomap.cpp
View File

@ -293,7 +293,7 @@ void Holomap::drawHoloObj(const IVec3 &angle, int32 x, int32 y) {
const IVec3 &destPos = _engine->_renderer->longWorldRot(0, 0, 1000); const IVec3 &destPos = _engine->_renderer->longWorldRot(0, 0, 1000);
_engine->_renderer->setPosCamera(0, 0, 0); _engine->_renderer->setPosCamera(0, 0, 0);
_engine->_renderer->setBaseRotation(angle); _engine->_renderer->setBaseRotation(angle);
_engine->_renderer->setBaseRotationPos(0, 0, distance(zDistanceTrajectory)); _engine->_renderer->setCameraRotation(0, 0, distance(zDistanceTrajectory));
_engine->_interface->resetClip(); _engine->_interface->resetClip();
Common::Rect dirtyRect; Common::Rect dirtyRect;
_engine->_renderer->renderIsoModel(destPos, x, y, LBAAngles::ANGLE_0, _engine->_resources->_holomapPointModelPtr, dirtyRect); _engine->_renderer->renderIsoModel(destPos, x, y, LBAAngles::ANGLE_0, _engine->_resources->_holomapPointModelPtr, dirtyRect);
@ -456,13 +456,16 @@ void Holomap::drawListPos(int xRot, int yRot, int zRot, bool lower) {
continue; continue;
} }
const Location &loc = _locations[locationIdx]; const Location &loc = _locations[locationIdx];
_engine->_renderer->setAngleCamera(loc.angleX, loc.angleY, 0); const IVec3 &cameraRot = _engine->_renderer->setAngleCamera(loc.angleX, loc.angleY, 0);
const IVec3 &destPos = _engine->_renderer->longWorldRot(0, 0, loc.size + 1000); IVec3 m = _engine->_renderer->worldRotatePoint(IVec3(0, 0, 1000 + loc.size));
const IVec3 &destPos2 = _engine->_renderer->longWorldRot(0, 0, 1500); m.x = cameraRot.x;
const IVec3 &m1 = _engine->_renderer->worldRotatePoint(IVec3(0, 0, 1500));
_engine->_renderer->setInverseAngleCamera(xRot, yRot, zRot); _engine->_renderer->setInverseAngleCamera(xRot, yRot, zRot);
_engine->_renderer->setBaseRotationPos(0, 0, distance(ZOOM_BIG_HOLO)); _engine->_renderer->setCameraRotation(0, 0, distance(ZOOM_BIG_HOLO));
const IVec3 &destPos3 = _engine->_renderer->worldRotatePoint(destPos);
const IVec3 &destPos4 = _engine->_renderer->worldRotatePoint(destPos2); const IVec3 &destPos3 = _engine->_renderer->worldRotatePoint(m);
const IVec3 &destPos4 = _engine->_renderer->worldRotatePoint(m1);
bool visible; bool visible;
if (lower) { if (lower) {
visible = destPos3.z <= destPos4.z; visible = destPos3.z <= destPos4.z;
@ -480,9 +483,9 @@ void Holomap::drawListPos(int xRot, int yRot, int zRot, bool lower) {
drawList.posValue = destPos3.z; drawList.posValue = destPos3.z;
drawList.actorIdx = locationIdx; drawList.actorIdx = locationIdx;
drawList.type = flags; drawList.type = flags;
drawList.x = destPos.x; drawList.x = m.x;
drawList.y = destPos.y; drawList.y = m.y;
drawList.z = destPos.z; drawList.z = m.z;
++n; ++n;
} }
_engine->_redraw->sortDrawingList(drawListArray, n); _engine->_redraw->sortDrawingList(drawListArray, n);
@ -618,7 +621,7 @@ void Holomap::holoMap() {
_engine->_renderer->setLightVector(xRot, yRot, 0); _engine->_renderer->setLightVector(xRot, yRot, 0);
drawListPos(xRot, yRot, 0, false); drawListPos(xRot, yRot, 0, false);
_engine->_renderer->setInverseAngleCamera(xRot, yRot, 0); _engine->_renderer->setInverseAngleCamera(xRot, yRot, 0);
_engine->_renderer->setBaseRotationPos(0, 0, distance(ZOOM_BIG_HOLO)); _engine->_renderer->setCameraRotation(0, 0, distance(ZOOM_BIG_HOLO));
drawHoloMap(holomapImagePtr, holomapImageSize); drawHoloMap(holomapImagePtr, holomapImageSize);
drawListPos(xRot, yRot, 0, true); drawListPos(xRot, yRot, 0, true);
drawHolomapText(_engine->width() / 2, 25, "HoloMap"); drawHolomapText(_engine->width() / 2, 25, "HoloMap");

4
engines/twine/renderer/renderer.h
View File

@ -234,7 +234,7 @@ public:
IVec3 _projPos; IVec3 _projPos;
void setBaseRotationPos(int32 x, int32 y, int32 z); void setCameraRotation(int32 x, int32 y, int32 z);
IVec3 getHolomapRotation(const int32 angleX, const int32 angleY, const int32 angleZ) const; IVec3 getHolomapRotation(const int32 angleX, const int32 angleY, const int32 angleZ) const;
void setLightVector(int32 angleX, int32 angleY, int32 angleZ); void setLightVector(int32 angleX, int32 angleY, int32 angleZ);
@ -288,7 +288,7 @@ public:
void renderHolomapVertices(const ComputedVertex vertexCoordinates[3], const ComputedVertex textureCoordinates[3], uint8 *holomapImage, uint32 holomapImageSize); void renderHolomapVertices(const ComputedVertex vertexCoordinates[3], const ComputedVertex textureCoordinates[3], uint8 *holomapImage, uint32 holomapImageSize);
}; };
inline void Renderer::setBaseRotationPos(int32 x, int32 y, int32 z) { inline void Renderer::setCameraRotation(int32 x, int32 y, int32 z) {
_cameraRot.x = x; _cameraRot.x = x;
_cameraRot.y = y; _cameraRot.y = y;
_cameraRot.z = z; _cameraRot.z = z;