OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Removes remaining usage of Bink in Max plugin.

Browse Source 
- Removes Bink headers.
- Removes Bink Layer processing.
This commit is contained in:
Joseph Davies
2014-04-21 11:05:15 -07:00
parent 9732a997c0
commit 3898b4f39b
4 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Sources/Tools/MaxConvert/hsMaterialConverter.cpp
View File

@ -109,7 +109,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" #include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h"
#include "pfSurface/plLayerAVI.h" #include "pfSurface/plLayerAVI.h"
#include "pfSurface/plLayerBink.h"
#include "MaxComponent/plLightMapComponent.h" #include "MaxComponent/plLightMapComponent.h"
#include "plDrawable/plGeometrySpan.h" #include "plDrawable/plGeometrySpan.h"
@ -693,14 +692,6 @@ bool hsMaterialConverter::IsQTLayer(Texmap* texMap)
hsGuardEnd; hsGuardEnd;
} }
bool hsMaterialConverter::IsBinkLayer(Texmap* texMap)
{
hsGuardBegin("hsMaterialConverter::IsBinkLayer");
return false;
hsGuardEnd;
}
// MAXR3 broke GetCoordMapping, here's a work around which // MAXR3 broke GetCoordMapping, here's a work around which
// works for everything except "Texture - Planar from Object XYZ" // works for everything except "Texture - Planar from Object XYZ"
@ -1984,22 +1975,16 @@ static plLayerInterface* IProcessLayerMovie(plPassMtlBase* mtl, plLayerTex* layT
plAnimStealthNode* stealth = IGetEntireAnimation(mtl); plAnimStealthNode* stealth = IGetEntireAnimation(mtl);
plString ext = fileName.GetFileExt(); plString ext = fileName.GetFileExt();
bool isBink = (ext.CompareI("bik") == 0);
bool isAvi = (ext.CompareI("avi") == 0); bool isAvi = (ext.CompareI("avi") == 0);
if (isBink || isAvi) if (isAvi)
{ {
plFileName movieName = plFileName::Join("avi", fileName.GetFileName()); plFileName movieName = plFileName::Join("avi", fileName.GetFileName());
plLayerMovie* movieLayer = nil; plLayerMovie* movieLayer = nil;
plString moviePostfix; plString moviePostfix;
if (isBink) if (isAvi)
{
movieLayer = new plLayerBink;
moviePostfix = "_bink";
}
else if (isAvi)
{ {
movieLayer = new plLayerAVI; movieLayer = new plLayerAVI;
moviePostfix = "_avi"; moviePostfix = "_avi";
@ -4139,7 +4124,7 @@ bool hsMaterialConverter::IIsAnimatedTexmap(Texmap* texmap)
if (hsControlConverter::Instance().GetControllerByName(texmap, TSTR("Opacity"), ctl)) if (hsControlConverter::Instance().GetControllerByName(texmap, TSTR("Opacity"), ctl))
return true; return true;
if (HasAnimatedTextures(texmap) || IsAVILayer(texmap) || IsBinkLayer(texmap)|| IsQTLayer(texmap) || ITextureTransformIsAnimated(texmap)) if (HasAnimatedTextures(texmap) || IsAVILayer(texmap) || IsQTLayer(texmap) || ITextureTransformIsAnimated(texmap))
return true; return true;
return false; return false;

1
Sources/Tools/MaxConvert/hsMaterialConverter.h
View File

@ -126,7 +126,6 @@ public:
static bool IsFireLayer(plMaxNode* node, Texmap* texMap); static bool IsFireLayer(plMaxNode* node, Texmap* texMap);
static bool IsAVILayer(Texmap* texMap); static bool IsAVILayer(Texmap* texMap);
static bool IsQTLayer(Texmap* texMap); static bool IsQTLayer(Texmap* texMap);
static bool IsBinkLayer(Texmap* texMap);
// static bool IsEnvironMapped(plMaxNode *node); // static bool IsEnvironMapped(plMaxNode *node);
// static bool IsPortal(plMaxNode* node); // static bool IsPortal(plMaxNode* node);
static bool ForceNoUvsFlatten(plMaxNode* node); static bool ForceNoUvsFlatten(plMaxNode* node);

1
Sources/Tools/MaxConvert/plLayerConverter.cpp
View File

@ -100,7 +100,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline/plDynamicEnvMap.h" #include "plPipeline/plDynamicEnvMap.h"
#include "pfSurface/plLayerAVI.h" #include "pfSurface/plLayerAVI.h"
#include "pfSurface/plLayerBink.h"
#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
#include "MaxPlasmaMtls/Layers/plLayerTex.h" #include "MaxPlasmaMtls/Layers/plLayerTex.h"

3
Sources/Tools/MaxMain/CMakeLists.txt
View File

@ -93,9 +93,6 @@ target_link_libraries(MaxMain MaxExport)
target_link_libraries(MaxMain MaxPlasmaMtls) target_link_libraries(MaxMain MaxPlasmaMtls)
target_link_libraries(MaxMain ${3dsm_LIBRARIES}) target_link_libraries(MaxMain ${3dsm_LIBRARIES})
if(Bink_SDK_AVAILABLE)
target_link_libraries(MaxMain ${Bink_LIBRARIES})
endif()
target_link_libraries(MaxMain ${EXPAT_LIBRARY}) target_link_libraries(MaxMain ${EXPAT_LIBRARY})
target_link_libraries(MaxMain ${DirectX_LIBRARIES}) target_link_libraries(MaxMain ${DirectX_LIBRARIES})
target_link_libraries(MaxMain ${JPEG_LIBRARY}) target_link_libraries(MaxMain ${JPEG_LIBRARY})