Skip to content

Instantly share code, notes, and snippets.

18,91% residualvm [.] Graphics::PixelBuffer::getValueAt
15,53% residualvm [.] Graphics::PixelFormat::expand
15,43% residualvm [.] Graphics::PixelBuffer::setPixelAt
7,20% residualvm [.] Graphics::PixelFormat::colorToRGB
6,38% residualvm [.] Graphics::PixelFormat::RGBToColor
5,01% residualvm [.] Graphics::PixelFormat::colorToARGB
4,38% residualvm [.] Graphics::PixelBuffer::copyBuffer
2,62% residualvm [.] Graphics::PixelBuffer::setPixelAt
2,31% residualvm [.] Graphics::PixelBuffer::getRGBAt
2,11% residualvm [.] Graphics::PixelFormat::gBits
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index 0ca3231..b07c016 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -92,6 +92,9 @@ void SdlMixerManager::init() {
debug(1, "SDL mixer sound format: %d differs from desired: %d", _obtained.format, desired.format);
SDL_CloseAudio();
+ fmt.freq = _obtained.freq;
+ fmt.samples = _obtained.samples;
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index 728c9e3..f9feaef 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -727,6 +727,7 @@ void GfxOpenGLS::startActorDraw(const Actor *actor) {
_actorProgram->setUniform("hasZBuffer", hasZBuffer);
_actorProgram->setUniform("texcropZBuf", _zBufTexCrop);
_actorProgram->setUniform("screenSize", Math::Vector2d(_screenWidth, _screenHeight));
+ _actorProgram->setUniform1f("alphaRef", 0.5f);
}
diff --git a/engines/myst3/subtitles.cpp b/engines/myst3/subtitles.cpp
index 818b243..255faf0 100644
--- a/engines/myst3/subtitles.cpp
+++ b/engines/myst3/subtitles.cpp
@@ -55,7 +55,8 @@ Subtitles::Subtitles(Myst3Engine *vm) :
_surface(0),
_texture(0),
_frame(-1),
- _font(0) {
+ _font(0),
diff --git a/engines/myst3/gfx_opengl_texture.cpp b/engines/myst3/gfx_opengl_texture.cpp
index 6f855ca..558ebd7 100644
--- a/engines/myst3/gfx_opengl_texture.cpp
+++ b/engines/myst3/gfx_opengl_texture.cpp
@@ -56,7 +56,7 @@ OpenGLTexture::OpenGLTexture(const Graphics::Surface *surface, bool nonPoTSuppor
if (format.bytesPerPixel == 4) {
internalFormat = GL_RGBA;
- sourceFormat = GL_UNSIGNED_BYTE;
+ sourceFormat = GL_UNSIGNED_INT_8_8_8_8_REV;
graphics/libgraphics.a(framebuffer.o): In function `Graphics::FrameBuffer::~FrameBuffer()':
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:109: undefined reference to `glDeleteRenderbuffersEXT'
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:110: undefined reference to `glDeleteFramebuffersEXT'
graphics/libgraphics.a(framebuffer.o): In function `Graphics::FrameBuffer::init()':
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:116: undefined reference to `glGenFramebuffersEXT'
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:117: undefined reference to `glGenRenderbuffersEXT'
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:119: undefined reference to `glBindFramebufferEXT'
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:120: undefined reference to `glFramebufferTexture2DEXT'
C:\msys64\home\boucletb\residualvm/graphics/opengles2/framebuffer.cpp:123: undefined reference to `glBindRend
<NAME>Manny's got company</NAME>
<DATE>September 2nd, 2014</DATE>
<AUTHOR>bgk</AUTHOR>
<BODY>
<p>
Adding support for Myst III: Exile to ResidualVM is nearly done.
Now, we only need your help to find the last rough edges by playing the game thoroughly and reporting any issues you encounter.
</p>
<p>
If you are interested, locate your copy of the game, and <a href="http://www.residualvm.org/downloads/">download</a> a daily build (not the 0.1.1 release build).
diff --git a/engines/myst3/gfx.cpp b/engines/myst3/gfx.cpp
index 9c5b4f7..66a1ce1 100644
--- a/engines/myst3/gfx.cpp
+++ b/engines/myst3/gfx.cpp
@@ -77,8 +77,10 @@ OpenGLTexture::OpenGLTexture(const Graphics::Surface *surface) {
height = surface->h;
format = surface->format;
- internalHeight = upperPowerOfTwo(height);
- internalWidth = upperPowerOfTwo(width);
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 967bbb5..b87134d 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -195,12 +195,13 @@ bool VideoDecoder::setReverse(bool reverse) {
// Attempt to make sure all the tracks are in the requested direction
for (TrackList::iterator it = _tracks.begin(); it != _tracks.end(); it++)
- if ((*it)->getTrackType() == Track::kTrackTypeVideo && ((VideoTrack *)*it)->isReversed() != reverse)
+ if ((*it)->getTrackType() == Track::kTrackTypeVideo && ((VideoTrack *)*it)->isReversed() != reverse) {
diff --git a/engines/myst3/inventory.cpp b/engines/myst3/inventory.cpp
index 49e563b..254c680 100644
--- a/engines/myst3/inventory.cpp
+++ b/engines/myst3/inventory.cpp
@@ -284,6 +284,7 @@ DragItem::DragItem(Myst3Engine *vm, uint id):
_movieStream = movieDesc->getData();
_bink.setDefaultHighColorFormat(Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24));
_bink.loadStream(_movieStream);
+ _bink.start();