From 3898b4f39bad67f961f4ccd7e6942544fac23593 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Mon, 21 Apr 2014 11:05:15 -0700 Subject: [PATCH] Removes remaining usage of Bink in Max plugin. - Removes Bink headers. - Removes Bink Layer processing. --- .../Tools/MaxConvert/hsMaterialConverter.cpp | 21 +++---------------- .../Tools/MaxConvert/hsMaterialConverter.h | 1 - Sources/Tools/MaxConvert/plLayerConverter.cpp | 1 - Sources/Tools/MaxMain/CMakeLists.txt | 3 --- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp index ac94080b..34891e20 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp @@ -109,7 +109,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" #include "pfSurface/plLayerAVI.h" -#include "pfSurface/plLayerBink.h" #include "MaxComponent/plLightMapComponent.h" #include "plDrawable/plGeometrySpan.h" @@ -693,14 +692,6 @@ bool hsMaterialConverter::IsQTLayer(Texmap* texMap) hsGuardEnd; } -bool hsMaterialConverter::IsBinkLayer(Texmap* texMap) -{ - hsGuardBegin("hsMaterialConverter::IsBinkLayer"); - return false; - hsGuardEnd; -} - - // MAXR3 broke GetCoordMapping, here's a work around which // works for everything except "Texture - Planar from Object XYZ" @@ -1984,22 +1975,16 @@ static plLayerInterface* IProcessLayerMovie(plPassMtlBase* mtl, plLayerTex* layT plAnimStealthNode* stealth = IGetEntireAnimation(mtl); plString ext = fileName.GetFileExt(); - bool isBink = (ext.CompareI("bik") == 0); bool isAvi = (ext.CompareI("avi") == 0); - if (isBink || isAvi) + if (isAvi) { plFileName movieName = plFileName::Join("avi", fileName.GetFileName()); plLayerMovie* movieLayer = nil; plString moviePostfix; - if (isBink) - { - movieLayer = new plLayerBink; - moviePostfix = "_bink"; - } - else if (isAvi) + if (isAvi) { movieLayer = new plLayerAVI; moviePostfix = "_avi"; @@ -4139,7 +4124,7 @@ bool hsMaterialConverter::IIsAnimatedTexmap(Texmap* texmap) if (hsControlConverter::Instance().GetControllerByName(texmap, TSTR("Opacity"), ctl)) 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 false; diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.h b/Sources/Tools/MaxConvert/hsMaterialConverter.h index 7ff6f913..daefba7f 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.h +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.h @@ -126,7 +126,6 @@ public: static bool IsFireLayer(plMaxNode* node, Texmap* texMap); static bool IsAVILayer(Texmap* texMap); static bool IsQTLayer(Texmap* texMap); - static bool IsBinkLayer(Texmap* texMap); // static bool IsEnvironMapped(plMaxNode *node); // static bool IsPortal(plMaxNode* node); static bool ForceNoUvsFlatten(plMaxNode* node); diff --git a/Sources/Tools/MaxConvert/plLayerConverter.cpp b/Sources/Tools/MaxConvert/plLayerConverter.cpp index ee26da7c..766b8689 100644 --- a/Sources/Tools/MaxConvert/plLayerConverter.cpp +++ b/Sources/Tools/MaxConvert/plLayerConverter.cpp @@ -100,7 +100,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline/plDynamicEnvMap.h" #include "pfSurface/plLayerAVI.h" -#include "pfSurface/plLayerBink.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #include "MaxPlasmaMtls/Layers/plLayerTex.h" diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index afe93984..1916ccb2 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -93,9 +93,6 @@ target_link_libraries(MaxMain MaxExport) target_link_libraries(MaxMain MaxPlasmaMtls) 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 ${DirectX_LIBRARIES}) target_link_libraries(MaxMain ${JPEG_LIBRARY})