Browse Source
- Removes Bink headers. - Remove usage of Bink movie layers in pfJournalBook (replacing it with plLayerAVI in the interim). - Removes Bink cmake. Conflicts: CMakeLists.txt Sources/Plasma/Apps/plClient/plClient.cpp Sources/Plasma/PubUtilLib/plPipeline/plBinkPlayer.h
17 changed files with 69 additions and 318 deletions
@ -1,65 +0,0 @@
|
||||
/*==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 plLayerBink_inc |
||||
#define plLayerBink_inc |
||||
|
||||
#include "plLayerMovie.h" |
||||
|
||||
class plLayerBink : public plLayerMovie |
||||
{ |
||||
protected: |
||||
virtual int32_t ISecsToFrame(float secs) { return 0; } |
||||
virtual bool IInit() { return true; } |
||||
virtual bool IGetCurrentFrame() { return true; } |
||||
virtual bool IRelease() { return true; } |
||||
|
||||
public: |
||||
plLayerBink() { } |
||||
virtual ~plLayerBink() { } |
||||
|
||||
CLASSNAME_REGISTER( plLayerBink ); |
||||
GETINTERFACE_ANY( plLayerBink, plLayerMovie ); |
||||
|
||||
}; |
||||
|
||||
#endif // plLayerBink_inc
|
||||
@ -1,129 +0,0 @@
|
||||
/*==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() { } |
||||
|
||||
static bool Init( hsWindowHndl hWnd) { return true; } |
||||
static bool DeInit() { return true; } |
||||
|
||||
static void SetForeGroundTrack(uint32_t t) { } |
||||
static void SetBackGroundTrack(uint32_t t) { } |
||||
static uint32_t GetForeGroundTrack() { } |
||||
static uint32_t 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(); |
||||
fFileName = plString::Null; |
||||
return false; |
||||
} |
||||
|
||||
void SetFileName(const plString& filename) { |
||||
fFileName = 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) { } |
||||
|
||||
plString 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_t 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: |
||||
plString fFileName; |
||||
hsTArray<plMessage*> fCallbacks; |
||||
}; |
||||
|
||||
#endif // plBinkPlayer_inc
|
||||
@ -1,16 +0,0 @@
|
||||
find_path(Bink_INCLUDE_DIR bink.h |
||||
C:/BinkW32 |
||||
) |
||||
|
||||
find_library(Bink_LIBRARY NAMES binkw32 |
||||
PATHS C:/BinkW32 |
||||
) |
||||
|
||||
if(Bink_INCLUDE_DIR AND Bink_LIBRARY) |
||||
set(Bink_SDK_AVAILABLE TRUE) |
||||
add_definitions(-DBINK_SDK_AVAILABLE) |
||||
else() |
||||
set(Bink_SDK_AVAILABLE FALSE) |
||||
endif() |
||||
|
||||
set(Bink_LIBRARIES ${Bink_LIBRARY}) |
||||
Loading…
Reference in new issue