|
|
@ -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; |
|
|
|