[Scummvm-git-logs] scummvm master -> a7d77510358edae0dfb25ce5398683f332cce289
whoozle
noreply at scummvm.org
Wed Feb 18 22:35:44 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
9986898c2f PHOENIXVR: do not update panning for finished sound channels
a7d7751035 PHOENIXVR: more visible hint effect
Commit: 9986898c2f47793bff5c89b091d222afed0646a2
https://github.com/scummvm/scummvm/commit/9986898c2f47793bff5c89b091d222afed0646a2
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-02-18T21:49:41Z
Commit Message:
PHOENIXVR: do not update panning for finished sound channels
Changed paths:
engines/phoenixvr/phoenixvr.cpp
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index 7663a435e55..e60ee55732f 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -598,6 +598,7 @@ void PhoenixVREngine::tick(float dt) {
if (!_mixer->isSoundHandleActive(sound.handle)) {
_mixer->stopHandle(sound.handle);
finishedSounds.push_back(kv._key);
+ continue;
}
if (!sound.spatial)
continue;
Commit: a7d77510358edae0dfb25ce5398683f332cce289
https://github.com/scummvm/scummvm/commit/a7d77510358edae0dfb25ce5398683f332cce289
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-02-18T22:35:22Z
Commit Message:
PHOENIXVR: more visible hint effect
Changed paths:
engines/phoenixvr/vr.cpp
engines/phoenixvr/vr.h
diff --git a/engines/phoenixvr/vr.cpp b/engines/phoenixvr/vr.cpp
index 24827ef807a..d4a466b267c 100644
--- a/engines/phoenixvr/vr.cpp
+++ b/engines/phoenixvr/vr.cpp
@@ -465,6 +465,11 @@ void VR::render(Graphics::Screen *screen, float ax, float ay, float fov, float d
if (regY < 0)
regY += kTau;
}
+ float hint = 0;
+ if (regSet) {
+ hint = fmod(_hint + dt * kTau, kTau);
+ _hint = hint;
+ }
for (int dstY = 0; dstY != h; ++dstY, line += incrementY) {
if (regSet) {
regX = ax - fov / 2;
@@ -474,6 +479,8 @@ void VR::render(Graphics::Screen *screen, float ax, float ay, float fov, float d
regX -= kTau;
}
Vector3d pixel = line;
+ int dx = regSet ? static_cast<int>(5 * cosf(hint + 100.0f * dstY / h)) : 0;
+
for (int dstX = 0; dstX != w; ++dstX, pixel += incrementX) {
Vector3d ray = pixel.getNormalized();
auto cube = toCube(ray.x(), ray.y(), ray.z());
@@ -485,6 +492,7 @@ void VR::render(Graphics::Screen *screen, float ax, float ay, float fov, float d
srcY &= 0xff;
srcY += (tileId << 8);
auto color = _pic->getPixel(srcX, srcY);
+ int x = dstX;
if (regSet) {
regX += regDX;
if (regX >= kTau)
@@ -493,14 +501,15 @@ void VR::render(Graphics::Screen *screen, float ax, float ay, float fov, float d
if (reg.contains3D(regX, kTau - regY)) {
byte r, g, b;
_pic->format.colorToRGB(color, r, g, b);
- r ^= _rnd.getRandomNumber(31);
- g ^= _rnd.getRandomNumber(31);
- b ^= _rnd.getRandomNumber(31);
- color = screen->format.RGBToColor(r, g, b);
+ x += dx;
}
}
}
- screen->setPixel(dstX, dstY, color);
+ if (x < 0)
+ x = 0;
+ else if (x >= screen->w)
+ x = screen->w - 1;
+ screen->setPixel(x, dstY, color);
}
if (regSet) {
regY += regDY;
diff --git a/engines/phoenixvr/vr.h b/engines/phoenixvr/vr.h
index 49778f70302..d9d53d92e1e 100644
--- a/engines/phoenixvr/vr.h
+++ b/engines/phoenixvr/vr.h
@@ -23,7 +23,6 @@
#define PHOENIXVR_VR_H
#include "common/array.h"
-#include "common/random.h"
#include "common/stream.h"
#include "graphics/managed_surface.h"
#include "graphics/pixelformat.h"
@@ -60,7 +59,7 @@ class VR {
void render(Graphics::Surface &pic, float dt);
};
Common::Array<Animation> _animations;
- Common::RandomSource _rnd = {"vr"};
+ float _hint = 0;
public:
static VR loadStatic(const Graphics::PixelFormat &format, Common::SeekableReadStream &s);
More information about the Scummvm-git-logs
mailing list