thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NANCY: Secondary video improvements

Browse source 
Added support for The Vampire Diaries' looping secondary videos.
Added support for disabling the hotspot. Fixed the incorrect start
frame when the mouse stops hovering. Fixed a bug where the
hover animation could stop working after panning the viewport.
This commit is contained in:
Kaloyan Chehlarski 2023-03-01 00:01:07 +02:00
parent 7c534ca1c3
commit 85e3a22510
2 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

49
engines/nancy/action/secondaryvideo.cpp
View file

@ -61,7 +61,7 @@ void PlaySecondaryVideo::updateGraphics() {
return; return;
} }
if (_isInFrame) { if (_isInFrame && _decoder.isPlaying() ? _decoder.needsUpdate() || _decoder.atEnd() : true) {
int lastAnimationFrame = -1; int lastAnimationFrame = -1;
switch (_hoverState) { switch (_hoverState) {
case kNoHover: case kNoHover:
@ -82,7 +82,6 @@ void PlaySecondaryVideo::updateGraphics() {
_decoder.start(); _decoder.start();
} }
_decoder.seekToFrame(_onHoverEndLastFrame);
_decoder.setRate(-_decoder.getRate()); _decoder.setRate(-_decoder.getRate());
} else { } else {
lastAnimationFrame = _onHoverLastFrame; lastAnimationFrame = _onHoverLastFrame;
@ -100,11 +99,15 @@ void PlaySecondaryVideo::updateGraphics() {
} }
} }
if (_decoder.isPlaying() && _decoder.needsUpdate()) { if (_decoder.isPlaying()) {
GraphicsManager::copyToManaged(*_decoder.decodeNextFrame(), _fullFrame, _paletteFilename.size() > 0); if (_decoder.needsUpdate()) {
_needsRedraw = true; GraphicsManager::copyToManaged(*_decoder.decodeNextFrame(), _fullFrame, _paletteFilename.size() > 0);
_needsRedraw = true;
}
if (lastAnimationFrame > -1 && _decoder.getCurFrame() == lastAnimationFrame + (_decoder.getRate().getNumerator() > 0 ? 1 : -1)) { if (lastAnimationFrame > -1 &&
(_decoder.atEnd() ||
_decoder.getCurFrame() == lastAnimationFrame + (_decoder.getRate().getNumerator() > 0 ? 1 : -1))) {
if (_hoverState == kNoHover) { if (_hoverState == kNoHover) {
_decoder.seekToFrame(_loopFirstFrame); _decoder.seekToFrame(_loopFirstFrame);
} else { } else {
@ -112,18 +115,21 @@ void PlaySecondaryVideo::updateGraphics() {
} }
} }
} }
}
if (_needsRedraw && _isVisible) { if (_needsRedraw && _isVisible) {
int vpFrame = -1; int vpFrame = -1;
for (uint i = 0; i < _videoDescs.size(); ++i) { for (uint i = 0; i < _videoDescs.size(); ++i) {
if (_videoDescs[i].frameID == _currentViewportFrame) { if (_videoDescs[i].frameID == _currentViewportFrame) {
vpFrame = i; vpFrame = i;
break; break;
}
} }
}
_drawSurface.create(_fullFrame, _videoDescs[vpFrame].srcRect); _drawSurface.create(_fullFrame, _videoDescs[vpFrame].srcRect);
moveTo(_videoDescs[vpFrame].destRect); moveTo(_videoDescs[vpFrame].destRect);
if (_enableHotspot == kTrue) {
_hotspot = _screenPosition; _hotspot = _screenPosition;
_hotspot.clip(NancySceneState.getViewport().getBounds()); _hotspot.clip(NancySceneState.getViewport().getBounds());
_hasHotspot = true; _hasHotspot = true;
@ -152,10 +158,17 @@ void PlaySecondaryVideo::handleInput(NancyInput &input) {
void PlaySecondaryVideo::readData(Common::SeekableReadStream &stream) { void PlaySecondaryVideo::readData(Common::SeekableReadStream &stream) {
readFilename(stream, _filename); readFilename(stream, _filename);
readFilename(stream, _paletteFilename); readFilename(stream, _paletteFilename);
stream.skip(10); stream.skip(10); // video overlay bitmap filename
if (_paletteFilename.size()) { if (_paletteFilename.size()) {
stream.skip(14); // unknown data stream.skip(12);
// videoSource (HD, CD, cache)
// ??
// _paletteStart
// _paletteSize
// hasOverlayBitmap
// ignoreHoverAnimation??
_enableHotspot = (NancyFlag)stream.readUint16LE();
} }
_loopFirstFrame = stream.readUint16LE(); _loopFirstFrame = stream.readUint16LE();
@ -212,13 +225,13 @@ void PlaySecondaryVideo::execute() {
} }
_isInFrame = true; _isInFrame = true;
_hoverState = kNoHover;
setVisible(true); setVisible(true);
} else { } else {
if (_isVisible) { if (_isVisible) {
setVisible(false); setVisible(false);
_hasHotspot = false; _hasHotspot = false;
_isInFrame = false; _isInFrame = false;
_hoverState = kNoHover;
_decoder.stop(); _decoder.stop();
} }
} }

5
engines/nancy/action/secondaryvideo.h
View file

@ -50,6 +50,11 @@ public:
Common::String _filename; Common::String _filename;
Common::String _paletteFilename; Common::String _paletteFilename;
// Common::String _bitmapOverlayFilename
// TVD only
NancyFlag _enableHotspot = kTrue;
uint16 _loopFirstFrame = 0; // 0x1E uint16 _loopFirstFrame = 0; // 0x1E
uint16 _loopLastFrame = 0; // 0x20 uint16 _loopLastFrame = 0; // 0x20
uint16 _onHoverFirstFrame = 0; // 0x22 uint16 _onHoverFirstFrame = 0; // 0x22