Browse Source

Reintroduce plBinkPlayer stub

and reenable as much USE_BINK_SDK stuff as empirically needed to get the Yeesha intro movie cave to disappear on its own, as before merging Cyan's Build 918.

Not the cleanest way, but I'm trying to minimize effort spent on this until we can get the proper solution, VP9 video support, from https://github.com/H-uru/Plasma/pull/458 .
bink-stub-2
Christian Walther 10 years ago
parent
commit
343c6ffbda
  1. 16
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
  2. 6
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.h
  3. 132
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plBinkPlayer.h

16
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp

@ -114,9 +114,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plStatusLog/plStatusLog.h" #include "../plStatusLog/plStatusLog.h"
#include "../plProgressMgr/plProgressMgr.h" #include "../plProgressMgr/plProgressMgr.h"
#include "../plPipeline/plDTProgressMgr.h" #include "../plPipeline/plDTProgressMgr.h"
#ifdef USE_BINK_SDK
#include "../plPipeline/plBinkPlayer.h" #include "../plPipeline/plBinkPlayer.h"
#endif
#include "../plMessage/plMovieMsg.h" #include "../plMessage/plMovieMsg.h"
#include "../plSDL/plSDL.h" #include "../plSDL/plSDL.h"
@ -271,10 +269,8 @@ hsBool plClient::Shutdown()
// Let the resmanager know we're going to be shutting down. // Let the resmanager know we're going to be shutting down.
hsgResMgr::ResMgr()->BeginShutdown(); hsgResMgr::ResMgr()->BeginShutdown();
#ifdef USE_BINK_SDK
// Must kill off all movies before shutting down audio. // Must kill off all movies before shutting down audio.
IKillMovies(); IKillMovies();
#endif
plgAudioSys::Activate(false); plgAudioSys::Activate(false);
#ifdef USE_BINK_SDK #ifdef USE_BINK_SDK
@ -822,13 +818,11 @@ hsBool plClient::MsgReceive(plMessage* msg)
} }
return true; return true;
} }
#ifdef USE_BINK_SDK
plMovieMsg* mov = plMovieMsg::ConvertNoRef(msg); plMovieMsg* mov = plMovieMsg::ConvertNoRef(msg);
if( mov ) if( mov )
{ {
return IHandleMovieMsg(mov); return IHandleMovieMsg(mov);
} }
#endif // USE_BINK_SDK
plLinkEffectsTriggerMsg* linkFX = plLinkEffectsTriggerMsg::ConvertNoRef(msg); plLinkEffectsTriggerMsg* linkFX = plLinkEffectsTriggerMsg::ConvertNoRef(msg);
if (linkFX) if (linkFX)
@ -875,7 +869,6 @@ hsBool plClient::MsgReceive(plMessage* msg)
return hsKeyedObject::MsgReceive(msg); return hsKeyedObject::MsgReceive(msg);
} }
#ifdef USE_BINK_SDK
//============================================================================ //============================================================================
hsBool plClient::IHandleMovieMsg(plMovieMsg* mov) hsBool plClient::IHandleMovieMsg(plMovieMsg* mov)
{ {
@ -956,7 +949,6 @@ hsBool plClient::IHandleMovieMsg(plMovieMsg* mov)
return true; return true;
} }
#endif // USE_BINK_SDK
int plClient::IFindRoomByLoc(const plLocation& loc) int plClient::IFindRoomByLoc(const plLocation& loc)
{ {
@ -1529,8 +1521,8 @@ hsBool plClient::StartInit()
//if( GetDone() ) return false; //if( GetDone() ) return false;
IPlayIntroBink("avi/intro1.bik", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75); IPlayIntroBink("avi/intro1.bik", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
if( GetDone() ) return false; if( GetDone() ) return false;
plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey());
#endif // USE_BINK_SDK #endif // USE_BINK_SDK
plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey());
// //
// Init Net before loading things // Init Net before loading things
@ -1936,11 +1928,9 @@ hsBool plClient::IDraw()
IProcessPostRenderRequests(); IProcessPostRenderRequests();
plProfile_EndTiming(PostRender); plProfile_EndTiming(PostRender);
#ifdef USE_BINK_SDK
plProfile_BeginTiming(Movies); plProfile_BeginTiming(Movies);
IServiceMovies(); IServiceMovies();
plProfile_EndTiming(Movies); plProfile_EndTiming(Movies);
#endif // USE_BINK_SDK
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
plProfile_BeginTiming(Console); plProfile_BeginTiming(Console);
@ -1971,7 +1961,6 @@ hsBool plClient::IDraw()
return false; return false;
} }
#ifdef USE_BINK_SDK
void plClient::IServiceMovies() void plClient::IServiceMovies()
{ {
int i; int i;
@ -1986,9 +1975,7 @@ void plClient::IServiceMovies()
} }
} }
} }
#endif // USE_BINK_SDK
#ifdef USE_BINK_SDK
void plClient::IKillMovies() void plClient::IKillMovies()
{ {
int i; int i;
@ -1996,7 +1983,6 @@ void plClient::IKillMovies()
delete fMovies[i]; delete fMovies[i];
fMovies.Reset(); fMovies.Reset();
} }
#endif // USE_BINK_SDK
#ifdef USE_BINK_SDK #ifdef USE_BINK_SDK
hsBool plClient::IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume /* = 1.0 */) hsBool plClient::IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume /* = 1.0 */)

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.h

@ -78,9 +78,7 @@ class plFontCache;
class plClientMsg; class plClientMsg;
class plLocation; class plLocation;
class plMovieMsg; class plMovieMsg;
#ifdef USE_BINK_SDK
class plBinkPlayer; class plBinkPlayer;
#endif
class plPreloaderMsg; class plPreloaderMsg;
class plNetCommAuthMsg; class plNetCommAuthMsg;
class plAgeLoaded2Msg; class plAgeLoaded2Msg;
@ -152,9 +150,7 @@ protected:
int fQuality; int fQuality;
hsBool fQuitIntro; hsBool fQuitIntro;
#ifdef USE_BINK_SDK
hsTArray<plBinkPlayer*> fMovies; hsTArray<plBinkPlayer*> fMovies;
#endif
hsBool fPatchGlobalAges; hsBool fPatchGlobalAges;
@ -197,10 +193,10 @@ protected:
#ifdef USE_BINK_SDK #ifdef USE_BINK_SDK
hsBool IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume = 1.0); hsBool IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume = 1.0);
#endif // USE_BINK_SDK
hsBool IHandleMovieMsg(plMovieMsg* mov); hsBool IHandleMovieMsg(plMovieMsg* mov);
void IKillMovies(); void IKillMovies();
void IServiceMovies(); void IServiceMovies();
#endif // USE_BINK_SDK
void IStartProgress( const char *title, hsScalar len ); void IStartProgress( const char *title, hsScalar len );
void IIncProgress( hsScalar byHowMuch, const char *text ); void IIncProgress( hsScalar byHowMuch, const char *text );

132
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plBinkPlayer.h

@ -0,0 +1,132 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#ifndef plBinkPlayer_inc
#define plBinkPlayer_inc
#include "HeadSpin.h"
#include "hsPoint2.h"
#include "hsTemplates.h"
struct D3DVertex;
class plDXPipeline;
struct IDirect3DTexture9;
class plMessage;
struct IDirectSound8;
class plBinkPlayer
{
public:
plBinkPlayer() : fFileName(nil) { }
~plBinkPlayer() { delete [] fFileName; }
static bool Init( hsWindowHndl hWnd) { return true; }
static bool DeInit() { return true; }
static void SetForeGroundTrack(UInt32 t) { }
static void SetBackGroundTrack(UInt32 t) { }
static UInt32 GetForeGroundTrack() { }
static UInt32 GetBackGroundTrack() { }
void SetDefaults() { }
bool Start(plPipeline* pipe, hsWindowHndl hWnd) { return false; }
bool NextFrame() {
// we have reached the end
return Stop();
}
bool Pause(bool on) { return false; }
bool Stop() {
for (int i = 0; i < fCallbacks.GetCount(); i++)
fCallbacks[i]->Send();
fCallbacks.Reset();
delete [] fFileName;
fFileName = nil;
return false;
}
void SetFileName(const char* filename) {
delete [] fFileName;
fFileName = hsStrcpy(filename);
}
void SetColor(const hsColorRGBA& c) { }
void SetPosition(float x, float y) { }
void SetScale(float x, float y) { }
void SetVolume(float v) { }
void SetForeVolume(float v) { }
void SetBackVolume(float v) { }
void SetPosition(const hsPoint2& p) { }
void SetScale(const hsPoint2& s) { }
const char* GetFileName() const { return fFileName; }
const hsColorRGBA GetColor() const { return hsColorRGBA(); }
const hsPoint2 GetPosition() const { return hsPoint2(); }
const hsPoint2 GetScale() const { return hsPoint2(); }
float GetBackVolume() const { return 0.0f; }
float GetForeVolume() const { return 0.0f; }
void AddCallback(plMessage* msg) { hsRefCnt_SafeRef(msg); fCallbacks.Append(msg); }
UInt32 GetNumCallbacks() const { return 0; }
plMessage* GetCallback(int i) const { return nil; }
void SetFadeFromTime(float secs) { }
void SetFadeFromColor(hsColorRGBA c) { }
void SetFadeToTime(float secs) { }
void SetFadeToColor(hsColorRGBA c) { }
float GetFadeFromTime() const { return 0.0f; }
hsColorRGBA GetFadeFromColor() const { return hsColorRGBA(); }
float GetFadeToTime() const { return 0.0f; }
hsColorRGBA GetFadeToColor() const { return hsColorRGBA(); }
private:
char* fFileName;
hsTArray<plMessage*> fCallbacks;
};
#endif // plBinkPlayer_inc
Loading…
Cancel
Save