diff --git a/CMakeLists.txt b/CMakeLists.txt index e8e174dc..147a0227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the clie find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client find_package(DirectX REQUIRED) -find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built... -# Or better yet, just eliminate bink altogether +find_package(MaxSDK) +find_package(Bink) option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) @@ -67,4 +67,4 @@ if(MSVC) endif(MSVC) add_subdirectory(Sources/Plasma) -# add_subdirectory(Sources/Tools) +add_subdirectory(Sources/Tools) diff --git a/Sources/Plasma/CoreLib/hsTypes.h b/Sources/Plasma/CoreLib/hsTypes.h index 91ce8c7b..8b8fef09 100644 --- a/Sources/Plasma/CoreLib/hsTypes.h +++ b/Sources/Plasma/CoreLib/hsTypes.h @@ -449,6 +449,8 @@ void SWAP (T & a, T & b) { * ***/ +#include + #ifndef offsetof #define offsetof(s,m) (size_t)&(((s *)0)->m) #endif // ifndef offsetof diff --git a/Sources/Plasma/CoreLib/hsWindows.h b/Sources/Plasma/CoreLib/hsWindows.h index 0ccdb221..4ac6cb82 100644 --- a/Sources/Plasma/CoreLib/hsWindows.h +++ b/Sources/Plasma/CoreLib/hsWindows.h @@ -28,8 +28,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if HS_BUILD_FOR_WIN32 #ifndef __AFX_H__ // MFC apps won't let us include windows from here. =( +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0400 +#endif // _WIN32_WINNT + +#ifndef MAXPLUGINCODE #include +#endif // MAXPLUGINCODE + #include #endif // __AFX_H__ diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h index 0e60102d..c5a31f31 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h @@ -46,7 +46,7 @@ class plEAXListenerMod; #ifdef EAX_SDK_AVAILABLE typedef struct _EAXREVERBPROPERTIES EAXREVERBPROPERTIES; #else -#include +#include "EFX-Util.h" #endif class plEAXListener diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt new file mode 100644 index 00000000..ee3b61cf --- /dev/null +++ b/Sources/Tools/CMakeLists.txt @@ -0,0 +1,20 @@ +#add_subdirectory(Migration) +#add_subdirectory(plDatMerger) +#add_subdirectory(plFontConverter) +#add_subdirectory(plResBrowser) + +# Max Stuff goes below here... +option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF) + +if(3dsm_BUILD_PLUGIN) + add_definitions(-DMAXPLUGINCODE) + + add_subdirectory(MaxComponent) + add_subdirectory(MaxConvert) + add_subdirectory(MaxExport) + add_subdirectory(MaxMain) + #add_subdirectory(MaxMtlUpdate) + add_subdirectory(MaxPlasmaLights) + add_subdirectory(MaxPlasmaMtls) + #add_subdirectory(MaxSceneViewer) +endif() \ No newline at end of file diff --git a/Sources/Tools/MaxComponent/CMakeLists.txt b/Sources/Tools/MaxComponent/CMakeLists.txt new file mode 100644 index 00000000..c78b1a68 --- /dev/null +++ b/Sources/Tools/MaxComponent/CMakeLists.txt @@ -0,0 +1,198 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(MaxComponent_HEADERS + BipedKiller.h + ComponentDummies.h + pfGUISkinComp.h + plActivatorBaseComponent.h + plActivatorComponent.h + plAnimComponent.h + plAnimCompProc.h + plAnimEventComponent.h + plAnimObjInterface.h + plAudioComponents.h + plAutoUIBase.h + plAutoUIBlock.h + plAutoUIComp.h + plAutoUIParams.h + plAvatarComponent.h + plBehavioralComponents.h + plBlowComponent.h + plCameraComponent.h + plCameraComponents.h + plCAnimParamBlock.h + plClickableComponent.h + plClickDragComponent.h + plClimbComponent.h + plClothingComponent.h + plClusterComponent.h + plComponent.h + plComponentBase.h + plComponentExt.h + plComponentMgr.h + plComponentProcBase.h + plComponentReg.h + plComponentTools.h + plDicer.h + plDistribComponent.h + plDistribComponent_old.h + plExcludeRegionComponent.h + plFlexibilityComponent.h + plFootstepComponent.h + plGrassComponent.h + plGUICompClassIDs.h + plGUIComponents.h + plImpactGadgetComponent.h + plInventoryObjComponent.h + plLightGrpComponent.h + plLightMapComponent.h + plLODFadeComponent.h + plMaxAnimUtils.h + plMaxWaveUtils.h + plMiscComponents.h + plMultistageBehComponent.h + plMultistageStage.h + plNavigableComponents.h + plNotetrackAnim.h + plNotetrackDlg.h + plNoteTrackDlgComp.h + plNPCSpawnComp.h + plObjectFlockerComponent.h + plOneShotComponent.h + plParticleComponents.h + plPhysicalComponents.h + plPhysicsGroups.h + plPickLocalizationDlg.h + plPickMaterialMap.h + plPickNode.h + plPickNodeBase.h + plPythonFileComponent.h + plResponderAnim.h + plResponderCmd.h + plResponderComponent.h + plResponderComponentPriv.h + plResponderGetComp.h + plResponderLink.h + plResponderMtl.h + plResponderWait.h + plShadowComponents.h + plSoftVolumeComponent.h + plVolumeGadgetComponent.h + plWaterComponent.h + plXImposter.h + WavFileStructs.h +) + +set(MaxComponent_RESOURCES + icon1.ico + plComponent.rc + resource.h + zoomin1.ico +) + +set(MaxComponent_SOURCES + pfGUISkinComp.cpp + plActivatorBaseComponent.cpp + plActivatorComponent.cpp + plAGComponents.cpp + plAnimComponent.cpp + plAnimCompProc.cpp + plAnimEventComponent.cpp + plAudioComponents.cpp + plAutoComponent.cpp + plAutoUIBase.cpp + plAutoUIBlock.cpp + plAutoUIComp.cpp + plAutoUIParams.cpp + plAvatarComponent.cpp + plBehavioralComponents.cpp + plBipedKiller.cpp + plBlowComponent.cpp + plCameraComponent.cpp + plCameraComponents.cpp + plCAnimParamBlock.cpp + plClickableComponent.cpp + plClickDragComponent.cpp + plClimbComponent.cpp + plClothingComponent.cpp + plClusterComponent.cpp + plComponent.cpp + plComponentBase.cpp + plComponentMgr.cpp + plComponentTools.cpp + plDicer.cpp + plDistribComponent.cpp + plDistribComponent_old.cpp + plExcludeRegionComponent.cpp + plFootPrintComponent.cpp + plFootstepComponent.cpp + plGrassComponent.cpp + plGUIComponents.cpp + plIgnoreComponent.cpp + plImpactGadgetComponent.cpp + plInventoryObjComponent.cpp + plLightGrpComponent.cpp + plLightMapComponent.cpp + plLineFollowComp.cpp + plLODFadeComponent.cpp + plMaxAnimUtils.cpp + plMaxWaveUtils.cpp + plMiscComponents.cpp + plMorphSeqComp.cpp + plMultistageBehComponent.cpp + plMultistageStage.cpp + plNavigableComponents.cpp + plNotetrackAnim.cpp + plNotetrackDlg.cpp + plNoteTrackDlgComp.cpp + plNPCSpawnComp.cpp + plObjectFlockerComponent.cpp + plOneShotComponent.cpp + plParticleComponents.cpp + plPhysConstraintComponents.cpp + plPhysicalComponents.cpp + plPickLocalizationDlg.cpp + plPickMaterialMap.cpp + plPickNode.cpp + plPickNodeBase.cpp + plPickNodeComp.cpp + plPythonFileComponent.cpp + plRepComponent.cpp + plResponderAnim.cpp + plResponderComponent.cpp + plResponderGetComp.cpp + plResponderLink.cpp + plResponderMtl.cpp + plResponderWait.cpp + plSeekPoint.cpp + plShadowComponents.cpp + plSmoothComponent.cpp + plSoftVolumeComponent.cpp + plTemplateComponent.cpp + plTypesComponents.cpp + plVolumeGadgetComponent.cpp + plWaterComponent.cpp + plXImposter.cpp +) + +add_library(MaxComponent + STATIC + ${MaxComponent_HEADERS} + ${MaxComponent_RESOURCES} + ${MaxComponent_SOURCES} +) + +source_group("Header Files" FILES ${MaxComponents_HEADERS}) +source_group("Resource Files" FILES ${MaxComponents_RESOURCES}) +source_group("Source Files" FILES ${MaxComponents_SOURCES}) + diff --git a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp index c33660a7..1a2d1a57 100644 --- a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp +++ b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUISkinComp.h" #include "plGUICompClassIDs.h" -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plMaxNodeBase.h" pfGUISkinEditProc *pfGUISkinEditProc::fInstance = nil; diff --git a/Sources/Tools/MaxComponent/pfGUISkinComp.h b/Sources/Tools/MaxComponent/pfGUISkinComp.h index f0daedb5..1a081c5f 100644 --- a/Sources/Tools/MaxComponent/pfGUISkinComp.h +++ b/Sources/Tools/MaxComponent/pfGUISkinComp.h @@ -28,8 +28,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" /// skin component class class plGUISkinComp : public plComponent diff --git a/Sources/Tools/MaxComponent/plAGComponents.cpp b/Sources/Tools/MaxComponent/plAGComponents.cpp index b34d2ec6..1a6436fa 100644 --- a/Sources/Tools/MaxComponent/plAGComponents.cpp +++ b/Sources/Tools/MaxComponent/plAGComponents.cpp @@ -33,28 +33,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //Messages related #include "plgDispatch.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "MaxMain/plPlasmaRefMsgs.h" //Scene related -#include "../plScene/plSceneNode.h" -#include "../plInterp/plController.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxMain/plMaxNodeData.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" +#include "plInterp/plController.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNodeData.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsResMgr.h" //Conversion related -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" //Avatar related -#include "../plAvatar/plAGAnim.h" -#include "../plAvatar/plMatrixChannel.h" +#include "plAvatar/plAGAnim.h" +#include "plAvatar/plMatrixChannel.h" #include "BipedKiller.h" //Anim related @@ -422,7 +422,7 @@ plEmoteComponent::plEmoteComponent() // Convert ------------------------------------------------------------ // -------- -plEmoteComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg) +hsBool plEmoteComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg) { Interface *theInterface = node->GetInterface(); RemoveBiped(node, theInterface); diff --git a/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp b/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp index 72fcabad..faf577a8 100644 --- a/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp +++ b/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp @@ -26,13 +26,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plActivatorBaseComponent.h" -#include "../pnKeyedObject/plKey.h" -#include "../MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" +#include "MaxMain/plMaxNode.h" -#include "../plModifier/plLogicModifier.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plModifier/plLogicModifier.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnMessage/plObjRefMsg.h" void plActivatorBaseComponent::AddReceiverKey(plKey pKey, plMaxNode* node) { diff --git a/Sources/Tools/MaxComponent/plActivatorBaseComponent.h b/Sources/Tools/MaxComponent/plActivatorBaseComponent.h index 2b59213e..61309071 100644 --- a/Sources/Tools/MaxComponent/plActivatorBaseComponent.h +++ b/Sources/Tools/MaxComponent/plActivatorBaseComponent.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysicalComponents.h" #include #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plMaxNode; diff --git a/Sources/Tools/MaxComponent/plAnimCompProc.cpp b/Sources/Tools/MaxComponent/plAnimCompProc.cpp index 3f8dd680..ff0b9e30 100644 --- a/Sources/Tools/MaxComponent/plAnimCompProc.cpp +++ b/Sources/Tools/MaxComponent/plAnimCompProc.cpp @@ -26,12 +26,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plAnimCompProc.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plComponentBase.h" #include "plPickNode.h" #include "plAnimComponent.h" -#include "../../PubUtilLib/plInterp/plAnimEaseTypes.h" +#include "plInterp/plAnimEaseTypes.h" plAnimCompProc::plAnimCompProc() : fCompButtonID(0), diff --git a/Sources/Tools/MaxComponent/plAnimComponent.cpp b/Sources/Tools/MaxComponent/plAnimComponent.cpp index a1655c9c..c2b01843 100644 --- a/Sources/Tools/MaxComponent/plAnimComponent.cpp +++ b/Sources/Tools/MaxComponent/plAnimComponent.cpp @@ -31,39 +31,39 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentProcBase.h" #include "plPhysicalComponents.h" #include "plMiscComponents.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" -#include "../plInterp/plController.h" +#include "plInterp/plController.h" #include "plNotetrackAnim.h" #include "hsResMgr.h" -#include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGChannel.h" -#include "../plAvatar/plAGAnim.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plMatrixChannel.h" -#include "../plAvatar/plPointChannel.h" -#include "../plAvatar/plScalarChannel.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxPlasmaMtls/Materials/plPassMtlBase.h" - -#include "../pnKeyedObject/plUoid.h" +#include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGChannel.h" +#include "plAvatar/plAGAnim.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plMatrixChannel.h" +#include "plAvatar/plPointChannel.h" +#include "plAvatar/plScalarChannel.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxPlasmaMtls/Materials/plPassMtlBase.h" + +#include "pnKeyedObject/plUoid.h" #include "plMaxAnimUtils.h" -#include "../MaxPlasmaLights/plRealTimeLightBase.h" -#include "../pfAnimation/plLightModifier.h" -#include "../pnKeyedObject/plMsgForwarder.h" +#include "MaxPlasmaLights/plRealTimeLightBase.h" +#include "pfAnimation/plLightModifier.h" +#include "pnKeyedObject/plMsgForwarder.h" -#include "../plSDL/plSDL.h" -#include "../plSDL/plSDLDescriptor.h" +#include "plSDL/plSDL.h" +#include "plSDL/plSDLDescriptor.h" #include "plPickNodeBase.h" // For material animations -#include "../MaxPlasmaMtls/Materials/plAnimStealthNode.h" +#include "MaxPlasmaMtls/Materials/plAnimStealthNode.h" // So that the linker won't throw this code away, since it doesn't appear to be used void DummyCodeIncludeFunc() {} @@ -419,7 +419,7 @@ static plEaseAccessor gAnimCompEaseAccessor(plComponentBase::kBlkComp, CLASS_DESC(plAnimComponent, gAnimDesc, "Animation", "Animation", COMP_TYPE_MISC, ANIM_COMP_CID) CLASS_DESC(plAnimGroupedComponent, gAnimGroupedDesc, "Animation Grouped", "AnimGrouped", COMP_TYPE_MISC, ANIM_GROUP_COMP_CID) -plAnimComponentBase::IsAnimComponent(plComponentBase *comp) +hsBool plAnimComponentBase::IsAnimComponent(plComponentBase *comp) { return (comp->ClassID() == ANIM_COMP_CID || comp->ClassID() == ANIM_GROUP_COMP_CID); diff --git a/Sources/Tools/MaxComponent/plAnimComponent.h b/Sources/Tools/MaxComponent/plAnimComponent.h index 5d37ede4..5416eeba 100644 --- a/Sources/Tools/MaxComponent/plAnimComponent.h +++ b/Sources/Tools/MaxComponent/plAnimComponent.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plComponent.h" #include "plComponentReg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" #include "plAnimObjInterface.h" #include "plNoteTrackDlgComp.h" @@ -66,7 +66,7 @@ public: virtual plKey GetModKey(plMaxNode *node)=0; const char *GetAnimName(); - static IsAnimComponent(plComponentBase *comp); + static hsBool IsAnimComponent(plComponentBase *comp); std::map fAnims; diff --git a/Sources/Tools/MaxComponent/plAnimEventComponent.cpp b/Sources/Tools/MaxComponent/plAnimEventComponent.cpp index fc925a9c..792a4616 100644 --- a/Sources/Tools/MaxComponent/plAnimEventComponent.cpp +++ b/Sources/Tools/MaxComponent/plAnimEventComponent.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAnimEventComponent.h" #include "plComponentReg.h" #include "resource.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plAnimComponent.h" #include "plNotetrackAnim.h" @@ -35,10 +35,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAnimCompProc.h" #include "plPickNode.h" -#include "../plModifier/plAnimEventModifier.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plModifier/plAnimEventModifier.h" +#include "plMessage/plAnimCmdMsg.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" void DummyCodeIncludeFuncAnimDetector() {} diff --git a/Sources/Tools/MaxComponent/plAudioComponents.cpp b/Sources/Tools/MaxComponent/plAudioComponents.cpp index 93693bdd..e28d888a 100644 --- a/Sources/Tools/MaxComponent/plAudioComponents.cpp +++ b/Sources/Tools/MaxComponent/plAudioComponents.cpp @@ -33,51 +33,51 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudioComponents.h" #include "plMiscComponents.h" #include "plAnimComponent.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../plAvatar/plAGAnim.h" +#include "plInterp/plAnimEaseTypes.h" +#include "plAvatar/plAGAnim.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxMain/plPluginResManager.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxConvert/plConvert.h" +#include "MaxMain/plPluginResManager.h" +#include "MaxMain/plPlasmaRefMsgs.h" #include "plgDispatch.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../plInterp/plController.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "plInterp/plController.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" //Physics Related //#include "../plHavok1/plHKPhysical.h" //Physics Comp -#include "../pnSceneObject/plSimulationInterface.h" -#include "../MaxMain/plPhysicalProps.h" -#include "../plPhysX/plPXPhysical.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "MaxMain/plPhysicalProps.h" +#include "plPhysX/plPXPhysical.h" // Sound Related -#include "../plPhysical/plEnvEffectDetector.h" -#include "../pnMessage/plEnvEffectMsg.h" -#include "../PubUtilLib/plAudible/plWinAudible.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "plPhysical/plEnvEffectDetector.h" +#include "pnMessage/plEnvEffectMsg.h" +#include "PubUtilLib/plAudible/plWinAudible.h" +#include "pnSceneObject/plAudioInterface.h" // Anim Related #include "plMaxAnimUtils.h" #include "plMaxWaveUtils.h" -#include "../pfAudio/plRandomSoundMod.h" -#include "../plAudio/plWin32StaticSound.h" -#include "../plAudio/plWin32StreamingSound.h" -#include "../plAudio/plWin32GroupedSound.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plFile/plFileUtils.h" +#include "pfAudio/plRandomSoundMod.h" +#include "plAudio/plWin32StaticSound.h" +#include "plAudio/plWin32StreamingSound.h" +#include "plAudio/plWin32GroupedSound.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plFile/plFileUtils.h" // Valdez Asset Manager Related #include "../../AssetMan/PublicInterface/MaxAssInterface.h" @@ -88,16 +88,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "../plIntersect/plSoftVolume.h" // Misc -#include "../MaxMain/plMaxCFGFile.h" +#include "MaxMain/plMaxCFGFile.h" #include "plPickNode.h" // EAX stuff -#include "../plAudio/plEAXListenerMod.h" +#include "plAudio/plEAXListenerMod.h" #include #include -#include "../plResMgr/plLocalization.h" -#include "../plPhysical/plPhysicalSndGroup.h" +#include "plResMgr/plLocalization.h" +#include "plPhysical/plPhysicalSndGroup.h" // EAX3 values which eax4 no longer defines, but we still need. // Single window material preset diff --git a/Sources/Tools/MaxComponent/plAudioComponents.h b/Sources/Tools/MaxComponent/plAudioComponents.h index 3e916646..29cc4b93 100644 --- a/Sources/Tools/MaxComponent/plAudioComponents.h +++ b/Sources/Tools/MaxComponent/plAudioComponents.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define EAX_LISTENER_COMPONENT_ID Class_ID(0x514f4b0a, 0x24672153) #define SOUND_PHYS_COMP_ID Class_ID(0x29415900, 0x1ade37a5) -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "../../AssetMan/PublicInterface/AssManBaseTypes.h" #include "hsTemplates.h" diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.cpp b/Sources/Tools/MaxComponent/plAutoUIParams.cpp index 36f9b3f5..46f1f298 100644 --- a/Sources/Tools/MaxComponent/plAutoUIParams.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIParams.cpp @@ -26,10 +26,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plAutoUIParams.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" #include "hsUtils.h" #include -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plComponentBase.h" plAutoUIParam::plAutoUIParam(ParamID id, const char *name) : diff --git a/Sources/Tools/MaxComponent/plAvatarComponent.cpp b/Sources/Tools/MaxComponent/plAvatarComponent.cpp index bb77c106..8a9e2efa 100644 --- a/Sources/Tools/MaxComponent/plAvatarComponent.cpp +++ b/Sources/Tools/MaxComponent/plAvatarComponent.cpp @@ -30,65 +30,65 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsConverterUtils.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plgDispatch.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plBitmapCreator.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plBitmapCreator.h" #include "hsStringTokenizer.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plMessage/plLayRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plMessage/plLayRefMsg.h" #include "plMaxAnimUtils.h" -#include "../plInterp/plController.h" -#include "../plPhysical/plSimDefs.h" +#include "plInterp/plController.h" +#include "plPhysical/plSimDefs.h" #include "plPhysicsGroups.h" -#include "../plAudible/plWinAudible.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plSurface/plLayerAnimation.h" -#include "../plSurface/hsGMaterial.h" -#include "../plAudio/plWin32StaticSound.h" -#include "../plAudioCore/plSoundBuffer.h" +#include "plAudible/plWinAudible.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plSurface/plLayerAnimation.h" +#include "plSurface/hsGMaterial.h" +#include "plAudio/plWin32StaticSound.h" +#include "plAudioCore/plSoundBuffer.h" #include "plAudioComponents.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvBrainCritter.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureEffects.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plLODMipmap.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainCritter.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureEffects.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plLODMipmap.h" // Auto generation of shadows here. #include "plShadowComponents.h" -#include "../plGLight/plShadowCaster.h" +#include "plGLight/plShadowCaster.h" #include "plAvatarComponent.h" -#include "../../tools/MaxComponent/plPhysicalComponents.h" +#include "plPhysicalComponents.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" //#include //#include #include "plPickNode.h" #include "plPickMaterialMap.h" -#include "../MaxMain/plMtlCollector.h" +#include "MaxMain/plMtlCollector.h" //#define BOB_SORT_AVATAR_FACES diff --git a/Sources/Tools/MaxComponent/plAvatarComponent.h b/Sources/Tools/MaxComponent/plAvatarComponent.h index c7081ac4..d06fee79 100644 --- a/Sources/Tools/MaxComponent/plAvatarComponent.h +++ b/Sources/Tools/MaxComponent/plAvatarComponent.h @@ -27,8 +27,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define __PLAVATARCOMPONENT_H__ #include "max.h" -#include "../plAvatar/plCritterCommands.h" -#include "../plAvatar/plPuppetCommands.h" +#include "plAvatar/plCritterCommands.h" +#include "plAvatar/plPuppetCommands.h" #define AVATAR_CLASS_ID Class_ID(0x49247847, 0xd3908fe) #define LOD_AVATAR_CLASS_ID Class_ID(0x50100640, 0x72f94120) diff --git a/Sources/Tools/MaxComponent/plBehavioralComponents.cpp b/Sources/Tools/MaxComponent/plBehavioralComponents.cpp index e4e581ed..9af9d9af 100644 --- a/Sources/Tools/MaxComponent/plBehavioralComponents.cpp +++ b/Sources/Tools/MaxComponent/plBehavioralComponents.cpp @@ -28,12 +28,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" #include "resource.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plPhysicalProps.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" -#include "../plAvatar/plSittingModifier.h" +#include "plAvatar/plSittingModifier.h" #include "plResponderComponent.h" #include "plPickNode.h" diff --git a/Sources/Tools/MaxComponent/plBipedKiller.cpp b/Sources/Tools/MaxComponent/plBipedKiller.cpp index ae508271..6cd08a51 100644 --- a/Sources/Tools/MaxComponent/plBipedKiller.cpp +++ b/Sources/Tools/MaxComponent/plBipedKiller.cpp @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" #include "plMiscComponents.h" -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plMaxNodeBase.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" #include "hsMatrix44.h" ////////////// @@ -208,7 +208,7 @@ void ProcessBipedNodeRecurse(INode *bipNode, INode *parent, Interface *theInterf { // reparent the siblings to the newly promoted replacement node numChildren = bipNode->NumberOfChildren(); - for (i = 0; i < numChildren; i++) + for (int i = 0; i < numChildren; i++) { INode *child = bipNode->GetChildNode(i); diff --git a/Sources/Tools/MaxComponent/plBlowComponent.cpp b/Sources/Tools/MaxComponent/plBlowComponent.cpp index 62493624..b8425bb0 100644 --- a/Sources/Tools/MaxComponent/plBlowComponent.cpp +++ b/Sources/Tools/MaxComponent/plBlowComponent.cpp @@ -31,15 +31,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "hsTypes.h" #include "plBlowComponent.h" -#include "../pfAnimation/plBlower.h" +#include "pfAnimation/plBlower.h" #include "plFlexibilityComponent.h" // Blow component first, related Flexibility component at EOF. diff --git a/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp b/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp index c08d05f3..c63738a0 100644 --- a/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp +++ b/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp @@ -42,8 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCAnimParamBlock.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../MaxPlasmaMtl/plPassMtlBase.h" +#include "plInterp/plAnimEaseTypes.h" +#include "MaxPlasmaMtls/Materials/plPassMtlBase.h" +#include "plAnimComponent.h" +#include "resource.h" + + //// Static ParamBlock Template ////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plCameraComponent.cpp b/Sources/Tools/MaxComponent/plCameraComponent.cpp index 1ff5350d..78b2ecfa 100644 --- a/Sources/Tools/MaxComponent/plCameraComponent.cpp +++ b/Sources/Tools/MaxComponent/plCameraComponent.cpp @@ -28,21 +28,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" -#include "../plPhysical/plCollisionDetector.h" // MM -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plCameraMsg.h" +#include "plPhysical/plCollisionDetector.h" // MM +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plCameraMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/plConvert.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/plConvert.h" -#include "../MaxMain/plPhysicalProps.h" -#include "../plHavok1/plHKPhysicsGroups.h" +#include "MaxMain/plPhysicalProps.h" +#include "plHavok1/plHKPhysicsGroups.h" void DummyCodeIncludeFuncCamera() {} diff --git a/Sources/Tools/MaxComponent/plCameraComponents.cpp b/Sources/Tools/MaxComponent/plCameraComponents.cpp index 55c95200..8c039fb5 100644 --- a/Sources/Tools/MaxComponent/plCameraComponents.cpp +++ b/Sources/Tools/MaxComponent/plCameraComponents.cpp @@ -28,45 +28,45 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "max.h" //Max Dependencies #include "resource.h" //Resource Dependencies -#include "hsResMgr.h" // Ibid +#include "hsResMgr.h" // Ibid #include "plComponent.h" //Component Dependencies #include "plComponentReg.h" #include "plCameraComponents.h" // Ibid #include "plAnimComponent.h" // Ibid -#include "../pnSceneObject/plSceneObject.h" // Ibid -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plScene/plSceneNode.h" // Ibid -#include "../pnKeyedObject/plKey.h" // Ibid -#include "../MaxMain/plMaxNode.h" // Ibid -#include "../MaxMain/plMaxNodeData.h" // Ibid - -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsConverterUtils.h" //Conversion Dependencies -#include "../MaxConvert/hsControlConverter.h" // Ibid - -#include "../plPhysical/plSimDefs.h" - -#include "plgDispatch.h" //Message Dependencies -#include "../pnMessage/plObjRefMsg.h" // Ibid -#include "../pnMessage/plIntRefMsg.h" // Ibid -#include "../pnMessage/plNodeRefMsg.h" // Ibid -#include "../pnMessage/plCameraMsg.h" // Ibid -#include "../MaxMain/plPlasmaRefMsgs.h" // Ibid -#include "../pfAnimation/plLineFollowMod.h" -#include "../plPhysical/plCollisionDetector.h" // MM - -#include "../pfCamera/plCameraBrain.h" -#include "../pfCamera/plCameraModifier.h" +#include "pnSceneObject/plSceneObject.h" // Ibid +#include "pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" // Ibid +#include "pnKeyedObject/plKey.h" // Ibid +#include "MaxMain/plMaxNode.h" // Ibid +#include "MaxMain/plMaxNodeData.h" // Ibid + +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies +#include "MaxConvert/hsControlConverter.h" // Ibid + +#include "plPhysical/plSimDefs.h" + +#include "plgDispatch.h" //Message Dependencies +#include "pnMessage/plObjRefMsg.h" // Ibid +#include "pnMessage/plIntRefMsg.h" // Ibid +#include "pnMessage/plNodeRefMsg.h" // Ibid +#include "pnMessage/plCameraMsg.h" // Ibid +#include "MaxMain/plPlasmaRefMsgs.h" // Ibid +#include "pfAnimation/plLineFollowMod.h" +#include "plPhysical/plCollisionDetector.h" // MM + +#include "pfCamera/plCameraBrain.h" +#include "pfCamera/plCameraModifier.h" #include "plMiscComponents.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" #include "plPhysicalComponents.h" // Line Follow related -#include "../plInterp/plAnimPath.h" -#include "../plInterp/plController.h" -#include "../pfAnimation/plLineFollowMod.h" -#include "../pfAnimation/plFollowMod.h" +#include "plInterp/plAnimPath.h" +#include "plInterp/plController.h" +#include "pfAnimation/plLineFollowMod.h" +#include "pfAnimation/plFollowMod.h" #include #include @@ -2397,12 +2397,13 @@ plCameraAnimCmdComponent::plCameraAnimCmdComponent() fIgnoreFOV = false; } -plCameraAnimCmdComponent::PreConvert(plMaxNode* pNode, plErrorMsg* pErrMsg) +hsBool plCameraAnimCmdComponent::PreConvert(plMaxNode* pNode, plErrorMsg* pErrMsg) { fIgnoreFOV = fCompPB->GetInt(kIgnoreFOV); return true; } -plCameraAnimCmdComponent::Convert(plMaxNode* pNode, plErrorMsg* pErrMsg) + +hsBool plCameraAnimCmdComponent::Convert(plMaxNode* pNode, plErrorMsg* pErrMsg) { plSceneObject* pObj = pNode->GetSceneObject(); const plCameraModifier1* pCamMod = nil; diff --git a/Sources/Tools/MaxComponent/plClickDragComponent.cpp b/Sources/Tools/MaxComponent/plClickDragComponent.cpp index 86e84ba3..8866e648 100644 --- a/Sources/Tools/MaxComponent/plClickDragComponent.cpp +++ b/Sources/Tools/MaxComponent/plClickDragComponent.cpp @@ -30,35 +30,35 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" #include "plAnimComponent.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plPhysical/plCollisionDetector.h" // MM -#include "../plModifier/plLogicModifier.h" -#include "../plModifier/plAxisAnimModifier.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../plPhysical/plPickingDetector.h" -#include "../pfConditional/plActivatorConditionalObject.h" -#include "../pfConditional/plFacingConditionalObject.h" -#include "../pfConditional/plObjectInBoxConditionalObject.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" + +#include "plPhysical/plCollisionDetector.h" // MM +#include "plModifier/plLogicModifier.h" +#include "plModifier/plAxisAnimModifier.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plPickingDetector.h" +#include "pfConditional/plActivatorConditionalObject.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plCursorChangeMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plMessage/plAnimCmdMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/plConvert.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/plConvert.h" #include "plResponderComponent.h" #include "plgDispatch.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" #include "plNotetrackAnim.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" void DummyCodeIncludeFuncClickDrag() {} diff --git a/Sources/Tools/MaxComponent/plClickableComponent.cpp b/Sources/Tools/MaxComponent/plClickableComponent.cpp index a98270bb..689a396c 100644 --- a/Sources/Tools/MaxComponent/plClickableComponent.cpp +++ b/Sources/Tools/MaxComponent/plClickableComponent.cpp @@ -28,31 +28,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plPhysical/plCollisionDetector.h" // MM -#include "../plModifier/plLogicModifier.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../plPhysical/plPickingDetector.h" -#include "../pfConditional/plActivatorConditionalObject.h" -#include "../pfConditional/plFacingConditionalObject.h" -#include "../pfConditional/plObjectInBoxConditionalObject.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" + +#include "plPhysical/plCollisionDetector.h" // MM +#include "plModifier/plLogicModifier.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plPickingDetector.h" +#include "pfConditional/plActivatorConditionalObject.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plCursorChangeMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxMain/plPhysicalProps.h" -#include "../plPhysical/plSimDefs.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/plConvert.h" +#include "MaxMain/plPhysicalProps.h" +#include "plPhysical/plSimDefs.h" #include "plResponderComponent.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" void DummyCodeIncludeFuncClickable() {} diff --git a/Sources/Tools/MaxComponent/plClimbComponent.cpp b/Sources/Tools/MaxComponent/plClimbComponent.cpp index 391cca0d..bc36b1fc 100644 --- a/Sources/Tools/MaxComponent/plClimbComponent.cpp +++ b/Sources/Tools/MaxComponent/plClimbComponent.cpp @@ -34,12 +34,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" // other -#include "../MaxMain/plMaxNode.h" -#include "../plMessage/plClimbMsg.h" -#include "../plPhysical/plCollisionDetector.h" -#include "../MaxMain/plPhysicalProps.h" -#include "../plPhysical/plSimDefs.h" -#include "../pnSceneObject/plSceneObject.h" +#include "MaxMain/plMaxNode.h" +#include "plMessage/plClimbMsg.h" +#include "plPhysical/plCollisionDetector.h" +#include "MaxMain/plPhysicalProps.h" +#include "plPhysical/plSimDefs.h" +#include "pnSceneObject/plSceneObject.h" // stl #include diff --git a/Sources/Tools/MaxComponent/plClothingComponent.cpp b/Sources/Tools/MaxComponent/plClothingComponent.cpp index 27caae89..4975f2fd 100644 --- a/Sources/Tools/MaxComponent/plClothingComponent.cpp +++ b/Sources/Tools/MaxComponent/plClothingComponent.cpp @@ -28,27 +28,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" //#include "hsUtils.h" #include "hsTemplates.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plClothingComponent.h" #include "plComponentReg.h" -#include "../MaxPlasmaMtls/Materials/plClothingMtl.h" -#include "../pnMessage/plRefMsg.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plMeshConverter.h" +#include "MaxPlasmaMtls/Materials/plClothingMtl.h" +#include "pnMessage/plRefMsg.h" +#include "plAvatar/plAvatarClothing.h" +#include "pnSceneObject/plSceneObject.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plMeshConverter.h" #include "plPickMaterialMap.h" -#include "../MaxMain/plMtlCollector.h" +#include "MaxMain/plMtlCollector.h" #include "plAvatarComponent.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../plDrawable/plSharedMesh.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plScene/plSceneNode.h" -#include "../plDrawable/plGeometrySpan.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "plDrawable/plSharedMesh.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plMorphSequence.h" +#include "plScene/plSceneNode.h" +#include "plDrawable/plGeometrySpan.h" void DummyCodeIncludeFuncClothing() { diff --git a/Sources/Tools/MaxComponent/plClusterComponent.cpp b/Sources/Tools/MaxComponent/plClusterComponent.cpp index 82688128..2c449539 100644 --- a/Sources/Tools/MaxComponent/plClusterComponent.cpp +++ b/Sources/Tools/MaxComponent/plClusterComponent.cpp @@ -32,33 +32,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxExport/plExportProgressBar.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" #include "hsTypes.h" #include "hsBitVector.h" -#include "../plMath/hsRadixSort.h" -#include "../plMath/plRandom.h" -#include "../pfAnimation/plBlower.h" +#include "plMath/hsRadixSort.h" +#include "plMath/plRandom.h" +#include "pfAnimation/plBlower.h" #include "plDicer.h" #include "plDistribComponent.h" -#include "../MaxConvert/plDistributor.h" -#include "../MaxConvert/plDistTree.h" +#include "MaxConvert/plDistributor.h" +#include "MaxConvert/plDistTree.h" #include "plMiscComponents.h" #include "plClusterComponent.h" -#include "../MaxConvert/plClusterUtil.h" -#include "../plDrawable/plClusterGroup.h" -#include "../plDrawable/plSpanTemplate.h" +#include "MaxConvert/plClusterUtil.h" +#include "plDrawable/plClusterGroup.h" +#include "plDrawable/plSpanTemplate.h" #include -using namespace std; ///////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plClusterComponent.h b/Sources/Tools/MaxComponent/plClusterComponent.h index 7215c57a..dbcf9129 100644 --- a/Sources/Tools/MaxComponent/plClusterComponent.h +++ b/Sources/Tools/MaxComponent/plClusterComponent.h @@ -40,7 +40,6 @@ class plDistribInstance; class plClusterGroup; #include -using namespace std; class plDistribCompTab : public Tab { @@ -72,7 +71,7 @@ protected: plDistribCompTab fDistribTab; plComponentBase* fLocationComp; - vector fClusterGroups; + std::vector fClusterGroups; // And more temps used only during Convert BOOL fSetupDone; diff --git a/Sources/Tools/MaxComponent/plComponent.cpp b/Sources/Tools/MaxComponent/plComponent.cpp index ce091b6c..23c0d4d1 100644 --- a/Sources/Tools/MaxComponent/plComponent.cpp +++ b/Sources/Tools/MaxComponent/plComponent.cpp @@ -27,5 +27,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" // Needed for the kTargs enum -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" diff --git a/Sources/Tools/MaxComponent/plComponentBase.cpp b/Sources/Tools/MaxComponent/plComponentBase.cpp index f43d10f0..381531fb 100644 --- a/Sources/Tools/MaxComponent/plComponentBase.cpp +++ b/Sources/Tools/MaxComponent/plComponentBase.cpp @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plComponentBase.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNodeBase.h" #include "plAutoUIComp.h" diff --git a/Sources/Tools/MaxComponent/plComponentBase.h b/Sources/Tools/MaxComponent/plComponentBase.h index e35a3aa3..545f7ada 100644 --- a/Sources/Tools/MaxComponent/plComponentBase.h +++ b/Sources/Tools/MaxComponent/plComponentBase.h @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" extern TCHAR *GetString(int id); extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxComponent/plComponentExt.h b/Sources/Tools/MaxComponent/plComponentExt.h index 2ff8db70..4f442dd4 100644 --- a/Sources/Tools/MaxComponent/plComponentExt.h +++ b/Sources/Tools/MaxComponent/plComponentExt.h @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentBase.h" #include "plComponentTools.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" class plMaxNodeBase; diff --git a/Sources/Tools/MaxComponent/plComponentMgr.h b/Sources/Tools/MaxComponent/plComponentMgr.h index ce40cca4..86c9dace 100644 --- a/Sources/Tools/MaxComponent/plComponentMgr.h +++ b/Sources/Tools/MaxComponent/plComponentMgr.h @@ -31,7 +31,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "utilapi.h" #include -using namespace std; class ClassDesc2; class Class_ID; @@ -54,7 +53,7 @@ class plTimerShare; class plComponentMgr : public UtilityObj { private: - vector fDescs; + std::vector fDescs; plComponentMgr() {}; diff --git a/Sources/Tools/MaxComponent/plComponentTools.cpp b/Sources/Tools/MaxComponent/plComponentTools.cpp index b03bd986..74e9a066 100644 --- a/Sources/Tools/MaxComponent/plComponentTools.cpp +++ b/Sources/Tools/MaxComponent/plComponentTools.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "max.h" -#include "../pnModifier/plModifier.h" +#include "pnModifier/plModifier.h" #include "plComponentTools.h" diff --git a/Sources/Tools/MaxComponent/plComponentTools.h b/Sources/Tools/MaxComponent/plComponentTools.h index 71a11bc3..01c8e3a6 100644 --- a/Sources/Tools/MaxComponent/plComponentTools.h +++ b/Sources/Tools/MaxComponent/plComponentTools.h @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class INode; class plModifier; diff --git a/Sources/Tools/MaxComponent/plDistribComponent.cpp b/Sources/Tools/MaxComponent/plDistribComponent.cpp index 0480d4df..55577aff 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent.cpp +++ b/Sources/Tools/MaxComponent/plDistribComponent.cpp @@ -35,18 +35,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" -#include "../MaxExport/plExportErrorMsg.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" +#include "MaxExport/plExportErrorMsg.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" #include "hsTypes.h" -#include "../MaxConvert/plDistributor.h" -#include "../MaxConvert/plDistTree.h" +#include "MaxConvert/plDistributor.h" +#include "MaxConvert/plDistTree.h" #include "plDistribComponent.h" diff --git a/Sources/Tools/MaxComponent/plDistribComponent.h b/Sources/Tools/MaxComponent/plDistribComponent.h index c5fca76b..5bba2a70 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent.h +++ b/Sources/Tools/MaxComponent/plDistribComponent.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com const Class_ID DISTRIBUTOR_COMP_CID(0x78143984, 0x3e7c78ec); -#include "../MaxConvert/plDistributor.h" +#include "MaxConvert/plDistributor.h" class plMaxNode; class plDistributor; diff --git a/Sources/Tools/MaxComponent/plDistribComponent_old.cpp b/Sources/Tools/MaxComponent/plDistribComponent_old.cpp index aeae1883..94b6e72a 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent_old.cpp +++ b/Sources/Tools/MaxComponent/plDistribComponent_old.cpp @@ -35,17 +35,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" #include "hsTypes.h" -#include "../MaxConvert/plDistributor.h" -#include "../MaxConvert/plDistTree.h" // FISH HACK - just testing +#include "MaxConvert/plDistributor.h" +#include "MaxConvert/plDistTree.h" // FISH HACK - just testing #include "plDistribComponent_old.h" diff --git a/Sources/Tools/MaxComponent/plDistribComponent_old.h b/Sources/Tools/MaxComponent/plDistribComponent_old.h index fb5e7d91..6e7c2274 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent_old.h +++ b/Sources/Tools/MaxComponent/plDistribComponent_old.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com const Class_ID DISTRIBUTOR_COMP_CID_OLD(0x490b247f, 0x56f60a0e); -#include "../MaxConvert/plDistributor.h" +#include "MaxConvert/plDistributor.h" class plMaxNode; class plDistributor; diff --git a/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp b/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp index 60268178..258dfd00 100644 --- a/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp +++ b/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp @@ -30,13 +30,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" -#include "../plModifier/plExcludeRegionModifier.h" -#include "../plPhysical/plSimDefs.h" +#include "plModifier/plExcludeRegionModifier.h" +#include "plPhysical/plSimDefs.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" void DummyCodeIncludeFuncExcludeRegion() {} diff --git a/Sources/Tools/MaxComponent/plExcludeRegionComponent.h b/Sources/Tools/MaxComponent/plExcludeRegionComponent.h index d4243f94..e73d55cc 100644 --- a/Sources/Tools/MaxComponent/plExcludeRegionComponent.h +++ b/Sources/Tools/MaxComponent/plExcludeRegionComponent.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plExcludeRegionComponent_h_inc #include "plPhysicalComponents.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include class plComponentBase; diff --git a/Sources/Tools/MaxComponent/plFootPrintComponent.cpp b/Sources/Tools/MaxComponent/plFootPrintComponent.cpp index 12712fba..de743232 100644 --- a/Sources/Tools/MaxComponent/plFootPrintComponent.cpp +++ b/Sources/Tools/MaxComponent/plFootPrintComponent.cpp @@ -30,38 +30,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" #include "plPickNode.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" -#include "../MaxConvert/hsMaterialConverter.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" +#include "MaxConvert/hsMaterialConverter.h" #include "hsTypes.h" #include "plTweak.h" #include "hsResMgr.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" - -#include "../plDrawable/plDynaFootMgr.h" -#include "../plDrawable/plDynaRippleMgr.h" -#include "../plDrawable/plDynaRippleVSMgr.h" -#include "../plDrawable/plDynaBulletMgr.h" -#include "../plDrawable/plDynaPuddleMgr.h" -#include "../plDrawable/plDynaTorpedoMgr.h" -#include "../plDrawable/plDynaTorpedoVSMgr.h" -#include "../plDrawable/plDynaWakeMgr.h" -#include "../plDrawable/plCutter.h" -#include "../plModifier/plDecalEnableMod.h" -#include "../plDrawable/plPrintShape.h" -#include "../plDrawable/plActivePrintShape.h" - -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" + +#include "plDrawable/plDynaFootMgr.h" +#include "plDrawable/plDynaRippleMgr.h" +#include "plDrawable/plDynaRippleVSMgr.h" +#include "plDrawable/plDynaBulletMgr.h" +#include "plDrawable/plDynaPuddleMgr.h" +#include "plDrawable/plDynaTorpedoMgr.h" +#include "plDrawable/plDynaTorpedoVSMgr.h" +#include "plDrawable/plDynaWakeMgr.h" +#include "plDrawable/plCutter.h" +#include "plModifier/plDecalEnableMod.h" +#include "plDrawable/plPrintShape.h" +#include "plDrawable/plActivePrintShape.h" + +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" #include "plWaterComponent.h" -#include "../plDrawable/plWaveSetBase.h" +#include "plDrawable/plWaveSetBase.h" #include "plParticleComponents.h" diff --git a/Sources/Tools/MaxComponent/plFootstepComponent.cpp b/Sources/Tools/MaxComponent/plFootstepComponent.cpp index 99b489ca..b9ac61b3 100644 --- a/Sources/Tools/MaxComponent/plFootstepComponent.cpp +++ b/Sources/Tools/MaxComponent/plFootstepComponent.cpp @@ -29,20 +29,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include #include "hsResMgr.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" #include "plFootstepComponent.h" #include "plAudioComponents.h" #include "plComponentReg.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureEffects.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pfAudio/plRandomSoundMod.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureEffects.h" +#include "plAvatar/plArmatureMod.h" +#include "pfAudio/plRandomSoundMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plNodeRefMsg.h" #include "plPickNode.h" void DummyCodeIncludeFuncFootstepSound() diff --git a/Sources/Tools/MaxComponent/plGUIComponents.cpp b/Sources/Tools/MaxComponent/plGUIComponents.cpp index 27c870b3..51f913bc 100644 --- a/Sources/Tools/MaxComponent/plGUIComponents.cpp +++ b/Sources/Tools/MaxComponent/plGUIComponents.cpp @@ -37,86 +37,85 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudioComponents.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plGeometrySpan.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" -#include "../plMessage/plLayRefMsg.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "plMessage/plMatRefMsg.h" -#include "../MaxMain/plPluginResManager.h" +#include "MaxMain/plPluginResManager.h" #include "plgDispatch.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plLayerConverter.h" -#include "../plInterp/plController.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plLayerConverter.h" +#include "plInterp/plController.h" +#include "plInterp/plAnimEaseTypes.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" // GUIDialog component. -#include "../plScene/plPostEffectMod.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" -#include "../pfGameGUIMgr/pfGUIControlMod.h" -#include "../pfGameGUIMgr/pfGUIControlHandlers.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" -#include "../pfGameGUIMgr/pfGUIDraggableMod.h" -#include "../pfGameGUIMgr/pfGUIListBoxMod.h" -#include "../pfGameGUIMgr/pfGUITextBoxMod.h" -#include "../pfGameGUIMgr/pfGUIEditBoxMod.h" -#include "../pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "../pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "../pfGameGUIMgr/pfGUITagDefs.h" -#include "../pfGameGUIMgr/pfGUIDragBarCtrl.h" -#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" -#include "../pfGameGUIMgr/pfGUIRadioGroupCtrl.h" -#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" -#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" -#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "plScene/plPostEffectMod.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUIControlHandlers.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIDraggableMod.h" +#include "pfGameGUIMgr/pfGUIListBoxMod.h" +#include "pfGameGUIMgr/pfGUITextBoxMod.h" +#include "pfGameGUIMgr/pfGUIEditBoxMod.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUITagDefs.h" +#include "pfGameGUIMgr/pfGUIDragBarCtrl.h" +#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" +#include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIClickMapCtrl.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" // Location Related -#include "../plAgeDescription/plAgeDescription.h" -#include "../MaxMain/plMaxCFGFile.h" -#include "../MaxMain/plAgeDescInterface.h" -#include "../plFile/hsFiles.h" +#include "plAgeDescription/plAgeDescription.h" +#include "MaxMain/plMaxCFGFile.h" +#include "MaxMain/plAgeDescInterface.h" +#include "plFile/hsFiles.h" +#include "MaxConvert/plConvert.h" +#include "MaxPlasmaMtls/Layers/plDynamicTextLayer.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxPlasmaMtls/Layers/plDynamicTextLayer.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" - -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" #include "plPickMaterialMap.h" -#include "../plInterp/plController.h" -#include "../plAvatar/plMatrixChannel.h" +#include "plInterp/plController.h" +#include "plAvatar/plMatrixChannel.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" #include "pfGUISkinComp.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" #include "plPickLocalizationDlg.h" diff --git a/Sources/Tools/MaxComponent/plGUIComponents.h b/Sources/Tools/MaxComponent/plGUIComponents.h index 097e2ad2..34d9a0d1 100644 --- a/Sources/Tools/MaxComponent/plGUIComponents.h +++ b/Sources/Tools/MaxComponent/plGUIComponents.h @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plGUIComponents_h #define _plGUIComponents_h -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plGUICompClassIDs.h" #include "plComponent.h" diff --git a/Sources/Tools/MaxComponent/plGrassComponent.cpp b/Sources/Tools/MaxComponent/plGrassComponent.cpp index b54b6916..75f6feff 100644 --- a/Sources/Tools/MaxComponent/plGrassComponent.cpp +++ b/Sources/Tools/MaxComponent/plGrassComponent.cpp @@ -31,19 +31,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsResMgr.h" #include "plQuality.h" -#include "../pnMessage/plRefMsg.h" -#include "../../PubUtilLib/plSurface/hsGMaterial.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/hsMaterialConverter.h" +#include "pnMessage/plRefMsg.h" +#include "plSurface/hsGMaterial.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/hsMaterialConverter.h" #include "plComponent.h" #include "plComponentReg.h" #include "plGrassComponent.h" -#include "../../PubUtilLib/plSurface/plGrassShaderMod.h" +#include "plSurface/plGrassShaderMod.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../MaxMain/plPluginResManager.h" +#include "pnKeyedObject/plUoid.h" +#include "pnMessage/plObjRefMsg.h" +#include "MaxMain/plPluginResManager.h" void DummyCodeIncludeFuncGrassShader() { diff --git a/Sources/Tools/MaxComponent/plIgnoreComponent.cpp b/Sources/Tools/MaxComponent/plIgnoreComponent.cpp index 13010d90..ea6c84b2 100644 --- a/Sources/Tools/MaxComponent/plIgnoreComponent.cpp +++ b/Sources/Tools/MaxComponent/plIgnoreComponent.cpp @@ -31,17 +31,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMiscComponents.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plMessage/plSimStateMsg.h" -#include "../pnMessage/plEnableMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "pnMessage/plEnableMsg.h" -#include "../MaxMain/plPluginResManager.h" +#include "MaxMain/plPluginResManager.h" void DummyCodeIncludeFuncIgnore() {} diff --git a/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp b/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp index f229cf25..a8ea9c0d 100644 --- a/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp +++ b/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp @@ -30,33 +30,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plPhysical/plCollisionDetector.h" // MM -#include "../plModifier/plLogicModifier.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../plPhysical/plPickingDetector.h" -#include "../pfConditional/plActivatorConditionalObject.h" -#include "../pfConditional/plFacingConditionalObject.h" -#include "../pfConditional/plObjectInBoxConditionalObject.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" + +#include "plPhysical/plCollisionDetector.h" // MM +#include "plModifier/plLogicModifier.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plPickingDetector.h" +#include "pfConditional/plActivatorConditionalObject.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plCursorChangeMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/plConvert.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/plConvert.h" #include "plResponderComponent.h" -#include "../MaxConvert/hsConverterUtils.h" //Conversion Dependencies +#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies #include "plPhysicalComponents.h" -#include "../pnMessage/plIntRefMsg.h" // Ibid +#include "pnMessage/plIntRefMsg.h" // Ibid #include "plComponentProcBase.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" void DummyCodeIncludeFuncImpactGadget() {} diff --git a/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp b/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp index d34c63e7..5c214782 100644 --- a/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp +++ b/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp @@ -31,27 +31,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" //Component Dependencies #include "plComponentReg.h" // Ibid -#include "../pnSceneObject/plSceneObject.h" // Ibid -#include "../pnKeyedObject/hsKeyedObject.h" // Ibid -#include "../MaxMain/plMaxNode.h" // Ibid +#include "pnSceneObject/plSceneObject.h" // Ibid +#include "pnKeyedObject/hsKeyedObject.h" // Ibid +#include "MaxMain/plMaxNode.h" // Ibid #include "plResponderComponent.h" -#include "../plPhysical/plCollisionDetector.h" //Modifiers Dependencies -#include "../plModifier/plLogicModifier.h" // Ibid -#include "../plModifier/plAxisAnimModifier.h" // Ibid -#include "../../NucleusLib/pnModifier/plConditionalObject.h" // Ibid -#include "../plPhysical/plPickingDetector.h" // Ibid -#include "../pfConditional/plActivatorConditionalObject.h" // Ibid -#include "../pfConditional/plFacingConditionalObject.h" // Ibid -#include "../pfConditional/plObjectInBoxConditionalObject.h" // Ibid +#include "plPhysical/plCollisionDetector.h" //Modifiers Dependencies +#include "plModifier/plLogicModifier.h" // Ibid +#include "plModifier/plAxisAnimModifier.h" // Ibid +#include "pnModifier/plConditionalObject.h" // Ibid +#include "plPhysical/plPickingDetector.h" // Ibid +#include "pfConditional/plActivatorConditionalObject.h" // Ibid +#include "pfConditional/plFacingConditionalObject.h" // Ibid +#include "pfConditional/plObjectInBoxConditionalObject.h" // Ibid -#include "../pnMessage/plObjRefMsg.h" //Message Dependencies -#include "../pnMessage/plNotifyMsg.h" // Ibid -#include "../pnMessage/plCursorChangeMsg.h" // Ibid +#include "pnMessage/plObjRefMsg.h" //Message Dependencies +#include "pnMessage/plNotifyMsg.h" // Ibid +#include "pnMessage/plCursorChangeMsg.h" // Ibid -#include "../MaxConvert/plConvert.h" +#include "MaxConvert/plConvert.h" // diff --git a/Sources/Tools/MaxComponent/plInventoryObjComponent.h b/Sources/Tools/MaxComponent/plInventoryObjComponent.h index c08a4acb..0d267725 100644 --- a/Sources/Tools/MaxComponent/plInventoryObjComponent.h +++ b/Sources/Tools/MaxComponent/plInventoryObjComponent.h @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plClickableComponent.h" #include "hsTemplates.h" #include -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plMaxNode; diff --git a/Sources/Tools/MaxComponent/plLODFadeComponent.cpp b/Sources/Tools/MaxComponent/plLODFadeComponent.cpp index 93ea6f82..d798cb83 100644 --- a/Sources/Tools/MaxComponent/plLODFadeComponent.cpp +++ b/Sources/Tools/MaxComponent/plLODFadeComponent.cpp @@ -29,17 +29,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" #include "hsTypes.h" #include "plLODFadeComponent.h" -#include "../pfSurface/plFadeOpacityMod.h" -#include "../pfSurface/plDistOpacityMod.h" +#include "pfSurface/plFadeOpacityMod.h" +#include "pfSurface/plDistOpacityMod.h" void DummyCodeIncludeFuncLODFade() { diff --git a/Sources/Tools/MaxComponent/plLightGrpComponent.cpp b/Sources/Tools/MaxComponent/plLightGrpComponent.cpp index d8f892ad..355d5860 100644 --- a/Sources/Tools/MaxComponent/plLightGrpComponent.cpp +++ b/Sources/Tools/MaxComponent/plLightGrpComponent.cpp @@ -29,17 +29,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" #include "hsResMgr.h" // LightGroup component -#include "../pnSceneObject/plSceneObject.h" -#include "../plGLight/plLightInfo.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../MaxPlasmaLights/plRealTimeLightBase.h" +#include "pnSceneObject/plSceneObject.h" +#include "plGLight/plLightInfo.h" +#include "plDrawable/plDrawableSpans.h" +#include "pnSceneObject/plDrawInterface.h" +#include "MaxPlasmaLights/plRealTimeLightBase.h" #include "plLightGrpComponent.h" diff --git a/Sources/Tools/MaxComponent/plLightMapComponent.cpp b/Sources/Tools/MaxComponent/plLightMapComponent.cpp index e69a52e7..0db909ca 100644 --- a/Sources/Tools/MaxComponent/plLightMapComponent.cpp +++ b/Sources/Tools/MaxComponent/plLightMapComponent.cpp @@ -30,11 +30,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" #include "hsResMgr.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plDrawable/plGeometrySpan.h" #include "plLightMapComponent.h" diff --git a/Sources/Tools/MaxComponent/plLineFollowComp.cpp b/Sources/Tools/MaxComponent/plLineFollowComp.cpp index 8ec348d5..613adb56 100644 --- a/Sources/Tools/MaxComponent/plLineFollowComp.cpp +++ b/Sources/Tools/MaxComponent/plLineFollowComp.cpp @@ -29,33 +29,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../plInterp/plController.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "plInterp/plController.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" #include "plgDispatch.h" -#include "../MaxMain/plPluginResManager.h" +#include "MaxMain/plPluginResManager.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" // Swivel related -#include "../pfAnimation/plViewFaceModifier.h" // ViewFace Comp +#include "pfAnimation/plViewFaceModifier.h" // ViewFace Comp // Line Follow related -#include "../plInterp/plAnimPath.h" -#include "../pfAnimation/plLineFollowMod.h" -#include "../pfAnimation/plFollowMod.h" +#include "plInterp/plAnimPath.h" +#include "pfAnimation/plLineFollowMod.h" +#include "pfAnimation/plFollowMod.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" // Stereizer -#include "../pfAnimation/plStereizer.h" +#include "pfAnimation/plStereizer.h" const Class_ID STEREIZE_COMP_CID(0x15066ec7, 0x64ea7381); const Class_ID LINEFOLLOW_COMP_CID(0x64ec57f6, 0x292d47f6); diff --git a/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp b/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp index 824e4039..51953336 100644 --- a/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp +++ b/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "plMaxAnimUtils.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" float TimeValueToGameTime(TimeValue t) { diff --git a/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp b/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp index 5f6925df..84627281 100644 --- a/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp +++ b/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "plMaxWaveUtils.h" -#include "../plAudio/plWavFile.h" +#include "plAudioCore/plWavFile.h" #include "hsTypes.h" SegmentMap *GetWaveSegmentMap(const char *file, plErrorMsg *pErrMsg) diff --git a/Sources/Tools/MaxComponent/plMiscComponents.cpp b/Sources/Tools/MaxComponent/plMiscComponents.cpp index a3206fba..6317a8b6 100644 --- a/Sources/Tools/MaxComponent/plMiscComponents.cpp +++ b/Sources/Tools/MaxComponent/plMiscComponents.cpp @@ -30,65 +30,65 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" #include "../../AssetMan/PublicInterface/MaxAssInterface.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNodeData.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNodeData.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../MaxMain/plPluginResManager.h" +#include "MaxMain/plPluginResManager.h" #include "plgDispatch.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../plInterp/plController.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" -#include "../plFile/plFileUtils.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "plInterp/plController.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" +#include "plFile/plFileUtils.h" // Follow mod -#include "../plInterp/plAnimPath.h" -#include "../pfAnimation/plFollowMod.h" +#include "plInterp/plAnimPath.h" +#include "pfAnimation/plFollowMod.h" //Player Attention Related -#include "../pfCamera/plInterestingModifier.h" +#include "pfCamera/plInterestingModifier.h" //Player Start Position -#include "../plModifier/plSpawnModifier.h" +#include "plModifier/plSpawnModifier.h" // RunTime related (Sprites, Billboards, LightMaps, etc., etc.) -#include "../pfAnimation/plViewFaceModifier.h" // ViewFace Comp +#include "pfAnimation/plViewFaceModifier.h" // ViewFace Comp // Anim Related #include "plMaxAnimUtils.h" // CavView component. -#include "../plScene/plPostEffectMod.h" +#include "plScene/plPostEffectMod.h" // Location Related -#include "../plAgeDescription/plAgeDescription.h" -#include "../MaxMain/plMaxCFGFile.h" -#include "../MaxMain/plAgeDescInterface.h" -#include "../plFile/hsFiles.h" -#include "../plResMgr/plPageInfo.h" +#include "plAgeDescription/plAgeDescription.h" +#include "MaxMain/plMaxCFGFile.h" +#include "MaxMain/plAgeDescInterface.h" +#include "plFile/hsFiles.h" +#include "plResMgr/plPageInfo.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plDrawable/plGeometrySpan.h" -#include "../MaxConvert/plConvert.h" +#include "MaxConvert/plConvert.h" // ImageLib -#include "../plModifier/plImageLibMod.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxConvert/plLayerConverter.h" -#include "../plGImage/plBitmap.h" +#include "plModifier/plImageLibMod.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxConvert/plLayerConverter.h" +#include "plGImage/plBitmap.h" void DummyCodeIncludeFuncMisc() { diff --git a/Sources/Tools/MaxComponent/plMorphSeqComp.cpp b/Sources/Tools/MaxComponent/plMorphSeqComp.cpp index be99c220..a5e87d2e 100644 --- a/Sources/Tools/MaxComponent/plMorphSeqComp.cpp +++ b/Sources/Tools/MaxComponent/plMorphSeqComp.cpp @@ -29,18 +29,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" #include "plPickNode.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" #include "hsTypes.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plDrawable/plSharedMesh.h" +#include "pnSceneObject/plSceneObject.h" +#include "plDrawable/plMorphSequence.h" +#include "plDrawable/plSharedMesh.h" const Class_ID MORPHSEQ_COMP_CID(0x37100f0a, 0x2d1f6b87); const Class_ID MORPHLAY_COMP_CID(0x138b1d44, 0x6c0a7417); diff --git a/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp b/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp index 9874541f..61a06ff5 100644 --- a/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp +++ b/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp @@ -32,11 +32,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "resource.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxAccelerators.h" -#include "../plAvatar/plAnimStage.h" -#include "../plAvatar/plMultistageBehMod.h" +#include "plAvatar/plAnimStage.h" +#include "plAvatar/plMultistageBehMod.h" #include "hsResMgr.h" #include diff --git a/Sources/Tools/MaxComponent/plMultistageStage.cpp b/Sources/Tools/MaxComponent/plMultistageStage.cpp index b8328bc4..79de5291 100644 --- a/Sources/Tools/MaxComponent/plMultistageStage.cpp +++ b/Sources/Tools/MaxComponent/plMultistageStage.cpp @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "hsUtils.h" -#include "../plAvatar/plAnimStage.h" +#include "plAvatar/plAnimStage.h" // We don't want to be subject to any changes to ReadSafeString, so we just keep // our own version now. Unfortunately, some files were saved with a modified diff --git a/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp b/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp index 4f17d86c..41104ef5 100644 --- a/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp +++ b/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp @@ -32,11 +32,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plActivatorBaseComponent.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" -#include "../plAvatar/plNPCSpawnMod.h" +#include "plAvatar/plNPCSpawnMod.h" -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plNotifyMsg.h" #include diff --git a/Sources/Tools/MaxComponent/plNPCSpawnComp.h b/Sources/Tools/MaxComponent/plNPCSpawnComp.h index 638f4d04..ea05392c 100644 --- a/Sources/Tools/MaxComponent/plNPCSpawnComp.h +++ b/Sources/Tools/MaxComponent/plNPCSpawnComp.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "max.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plComponentBase; class plMaxNodeBase; diff --git a/Sources/Tools/MaxComponent/plNavigableComponents.cpp b/Sources/Tools/MaxComponent/plNavigableComponents.cpp index d20cd387..bc7fd5d2 100644 --- a/Sources/Tools/MaxComponent/plNavigableComponents.cpp +++ b/Sources/Tools/MaxComponent/plNavigableComponents.cpp @@ -27,29 +27,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "max.h" #include "resource.h" // Resource Dependencies -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" #include "plComponent.h" //Component Dependencies #include "plComponentReg.h" // Ibid -#include "../MaxMain/plMaxNode.h" // Ibid -#include "../pnKeyedObject/plKey.h" // Ibid +#include "MaxMain/plMaxNode.h" // Ibid +#include "pnKeyedObject/plKey.h" // Ibid #include "plComponentProcBase.h" #include "plNavigableComponents.h" #include "plActivatorBaseComponent.h" #include "plPhysicalComponents.h" -#include "../MaxConvert/hsConverterUtils.h" //Conversion Dependencies -#include "../MaxConvert/hsControlConverter.h" // Ibid +#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies +#include "MaxConvert/hsControlConverter.h" // Ibid -#include "../plAvatar/plAvLadderModifier.h" //Modifier Dependencies -#include "../plPhysical/plSimDefs.h" +#include "plAvatar/plAvLadderModifier.h" //Modifier Dependencies +#include "plPhysical/plSimDefs.h" #include "plgDispatch.h" //Message Dependencies -#include "../pnMessage/plObjRefMsg.h" // Ibid -#include "../pnMessage/plIntRefMsg.h" // Ibid -#include "../pnMessage/plNodeRefMsg.h" // Ibid -#include "../MaxMain/plPlasmaRefMsgs.h" // Ibid +#include "pnMessage/plObjRefMsg.h" // Ibid +#include "pnMessage/plIntRefMsg.h" // Ibid +#include "pnMessage/plNodeRefMsg.h" // Ibid +#include "MaxMain/plPlasmaRefMsgs.h" // Ibid void DummyCodeIncludeFuncNavigablesRegion() {} diff --git a/Sources/Tools/MaxComponent/plNavigableComponents.h b/Sources/Tools/MaxComponent/plNavigableComponents.h index fd28b2df..83d3a3d6 100644 --- a/Sources/Tools/MaxComponent/plNavigableComponents.h +++ b/Sources/Tools/MaxComponent/plNavigableComponents.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAvLadderComponent_h_inc #include "plComponent.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plComponentBase; diff --git a/Sources/Tools/MaxComponent/plNotetrackAnim.cpp b/Sources/Tools/MaxComponent/plNotetrackAnim.cpp index 49d8ed59..a10e1476 100644 --- a/Sources/Tools/MaxComponent/plNotetrackAnim.cpp +++ b/Sources/Tools/MaxComponent/plNotetrackAnim.cpp @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plNotetrackAnim.h" #include "plComponentBase.h" -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plMaxNodeBase.h" plNotetrackAnim::plNotetrackAnim() : fSegMap(nil) { diff --git a/Sources/Tools/MaxComponent/plNotetrackDlg.cpp b/Sources/Tools/MaxComponent/plNotetrackDlg.cpp index 3ec31f6e..8291b9a4 100644 --- a/Sources/Tools/MaxComponent/plNotetrackDlg.cpp +++ b/Sources/Tools/MaxComponent/plNotetrackDlg.cpp @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "max.h" #include "iparamb2.h" -#include "../plInterp/plAnimEaseTypes.h" +#include "plInterp/plAnimEaseTypes.h" plNoteTrackDlg::plNoteTrackDlg() : fhAnim(NULL), fhLoop(NULL), fPB(nil), fAnimID(-1), fLoopID(-1), fSegMap(nil), fOwner(nil) { diff --git a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp index 124a1041..41704dff 100644 --- a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp +++ b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp @@ -28,15 +28,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "plObjectFlockerComponent.h" -#include "../pnKeyedObject/plUoid.h" -#include "../MaxMain/plMaxNode.h" +#include "pnKeyedObject/plUoid.h" +#include "MaxMain/plMaxNode.h" #include "plPickNode.h" -#include "../pfAnimation/pfObjectFlocker.h" -#include "../MaxMain/plPluginResManager.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pfAnimation/pfObjectFlocker.h" +#include "MaxMain/plPluginResManager.h" +#include "pnSceneObject/plSceneObject.h" void DummyCodeIncludeFuncObjectFlocker() { diff --git a/Sources/Tools/MaxComponent/plOneShotComponent.cpp b/Sources/Tools/MaxComponent/plOneShotComponent.cpp index 22a20d00..ea10f63a 100644 --- a/Sources/Tools/MaxComponent/plOneShotComponent.cpp +++ b/Sources/Tools/MaxComponent/plOneShotComponent.cpp @@ -30,40 +30,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #if 0 -#include "../MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsConverterUtils.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plgDispatch.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../pnKeyedObject/plKey.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "pnKeyedObject/plKey.h" -#include "../PubUtilLib/plResMgr/plLoc.h" +#include "plResMgr/plLoc.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plIntRefMsg.h" #include "plMaxAnimUtils.h" #include "tempAnim.h" -#include "../plInterp/plController.h" -#include "../plHavok1/plHKPhysical.h" -#include "../plAvatar/plAvatarMod.h" -#include "../plModifier/plAliasModifier.h" -#include "../plAudible/plWinAudible.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plInterp/plController.h" +#include "plHavok1/plHKPhysical.h" +#include "plAvatar/plAvatarMod.h" +#include "plModifier/plAliasModifier.h" +#include "plAudible/plWinAudible.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" #endif #include "hsResMgr.h" -#include "../plAvatar/plOneShotMod.h" +#include "plAvatar/plOneShotMod.h" #include diff --git a/Sources/Tools/MaxComponent/plOneShotComponent.h b/Sources/Tools/MaxComponent/plOneShotComponent.h index aadf76db..49f4091d 100644 --- a/Sources/Tools/MaxComponent/plOneShotComponent.h +++ b/Sources/Tools/MaxComponent/plOneShotComponent.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "max.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plComponentBase; class plMaxNodeBase; diff --git a/Sources/Tools/MaxComponent/plParticleComponents.cpp b/Sources/Tools/MaxComponent/plParticleComponents.cpp index ff008231..0ebc60cc 100644 --- a/Sources/Tools/MaxComponent/plParticleComponents.cpp +++ b/Sources/Tools/MaxComponent/plParticleComponents.cpp @@ -34,47 +34,46 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAnimComponent.h" #include "plNotetrackAnim.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plScene/plSceneNode.h" +#include "pnSceneObject/plSceneObject.h" +#include "plScene/plSceneNode.h" #include "plgDispatch.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plMeshConverter.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxPlasmaMtls/Materials/plParticleMtl.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plMeshConverter.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxMain/plMaxNode.h" +#include "MaxPlasmaMtls/Materials/plParticleMtl.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" #include "hsResMgr.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../plInterp/plController.h" -#include "../plInterp/hsInterp.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plSurface/hsGMaterial.h" -#include "../plPipeline/plGBufferGroup.h" - -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticleEffect.h" -#include "../plParticleSystem/plParticleGenerator.h" -#include "../plParticleSystem/plParticleApplicator.h" -#include "../plParticleSystem/plConvexVolume.h" -#include "../plParticleSystem/plBoundInterface.h" - -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGAnim.h" - -#include "../pnSceneObject/plDrawInterface.h" - -#include "../plGLight/plLightInfo.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "plInterp/plController.h" +#include "plInterp/hsInterp.h" +#include "plInterp/plAnimEaseTypes.h" +#include "MaxMain/plMaxNode.h" +#include "pnKeyedObject/plKey.h" +#include "plSurface/hsGMaterial.h" +#include "plPipeline/plGBufferGroup.h" + +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticleEffect.h" +#include "plParticleSystem/plParticleGenerator.h" +#include "plParticleSystem/plParticleApplicator.h" +#include "plParticleSystem/plConvexVolume.h" +#include "plParticleSystem/plBoundInterface.h" + +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGAnim.h" + +#include "pnSceneObject/plDrawInterface.h" + +#include "plGLight/plLightInfo.h" #include "plLightGrpComponent.h" void DummyCodeIncludeFuncParticles() diff --git a/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp b/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp index 096b5413..88b568db 100644 --- a/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp @@ -48,13 +48,13 @@ OBSOLETE_CLASS(plStrongSpringConstraintComponent, gPhysStrongSpringConstDesc, "( #include #include -//#include "../plHavok1/plHKConstraintSolver.h" //Got Havok Messiness... Must go before all plasma directories... -//#include "../plHavok1/plHavokConstraintTools.h" +//#include "plHavok1/plHKConstraintSolver.h" //Got Havok Messiness... Must go before all plasma directories... +//#include "plHavok1/plHavokConstraintTools.h" #include "plPhysicalComponents.h" #include "plComponentProcBase.h" -#include "../plPhysical/plPhysicsGroups.h" -#include "../MaxMain/plPhysicalProps.h" +#include "plPhysical/plPhysicsGroups.h" +#include "MaxMain/plPhysicalProps.h" //#include "max.h" //Max Dependencies, reffed in plEventGroupDefs #include "resource.h" //Resource Dependencies @@ -62,24 +62,24 @@ OBSOLETE_CLASS(plStrongSpringConstraintComponent, gPhysStrongSpringConstDesc, "( #include "plComponent.h" //Component Dependencies #include "plComponentReg.h" // Ibid -#include "../pnSceneObject/plSceneObject.h" // Ibid -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plScene/plSceneNode.h" // Ibid -#include "../pnKeyedObject/plKey.h" // Ibid -#include "../MaxMain/plMaxNode.h" // Ibid - -#include "../MaxConvert/hsConverterUtils.h" //Conversion Dependencies -#include "../MaxConvert/hsControlConverter.h" // Ibid - -#include "../plHavok1/plHKPhysical.h" //Havok Dependencies -#include "../MaxMain/plPhysicalProps.h" - -#include "plgDispatch.h" //Message Dependencies -#include "../pnMessage/plObjRefMsg.h" // Ibid -#include "../pnMessage/plIntRefMsg.h" // Ibid -#include "../pnMessage/plNodeRefMsg.h" // Ibid -#include "../MaxMain/plPlasmaRefMsgs.h" // Ibid -#include "../plModifier/plAliasModifier.h" +#include "pnSceneObject/plSceneObject.h" // Ibid +#include "pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" // Ibid +#include "pnKeyedObject/plKey.h" // Ibid +#include "MaxMain/plMaxNode.h" // Ibid + +#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies +#include "MaxConvert/hsControlConverter.h" // Ibid + +#include "plHavok1/plHKPhysical.h" //Havok Dependencies +#include "MaxMain/plPhysicalProps.h" + +#include "plgDispatch.h" //Message Dependencies +#include "pnMessage/plObjRefMsg.h" // Ibid +#include "pnMessage/plIntRefMsg.h" // Ibid +#include "pnMessage/plNodeRefMsg.h" // Ibid +#include "MaxMain/plPlasmaRefMsgs.h" // Ibid +#include "plModifier/plAliasModifier.h" // // DummyCodeIncludeFuncPhys Function. diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp index 93233499..b46f7ac5 100644 --- a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp @@ -36,18 +36,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" #include "plPhysicsGroups.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxMain/plPhysicalProps.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plPhysicalProps.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../plPhysical/plCollisionDetector.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../plMessage/plSwimMsg.h" -#include "../plAvatar/plSwimRegion.h" -#include "../plMessage/plRideAnimatedPhysMsg.h" +#include "plPhysical/plCollisionDetector.h" +#include "pnMessage/plObjRefMsg.h" +#include "plMessage/plSwimMsg.h" +#include "plAvatar/plSwimRegion.h" +#include "plMessage/plRideAnimatedPhysMsg.h" ///////////////////////////////////////////////////////////////// // diff --git a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp index 991d6113..80cd7107 100644 --- a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp +++ b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp @@ -24,10 +24,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPickLocalizationDlg.h" -#include "../pfLocalizationMgr/pfLocalizationDataMgr.h" +#include "pfLocalizationMgr/pfLocalizationDataMgr.h" -#include "../MaxMain/plMaxCFGFile.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxCFGFile.h" +#include "MaxMain/plMaxAccelerators.h" #include "hsUtils.h" #include "hsStringTokenizer.h" diff --git a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp index b03d6dc1..70b1a7d1 100644 --- a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp +++ b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPickMaterialMap.h" #include "max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" // MAXR4 HACK // Coming in the backdoor... diff --git a/Sources/Tools/MaxComponent/plPickNodeBase.cpp b/Sources/Tools/MaxComponent/plPickNodeBase.cpp index 12150dc8..029fef4f 100644 --- a/Sources/Tools/MaxComponent/plPickNodeBase.cpp +++ b/Sources/Tools/MaxComponent/plPickNodeBase.cpp @@ -26,10 +26,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plPickNodeBase.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plComponentBase.h" #include "resource.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" #include diff --git a/Sources/Tools/MaxComponent/plPickNodeComp.cpp b/Sources/Tools/MaxComponent/plPickNodeComp.cpp index b00d34ef..0ad3c433 100644 --- a/Sources/Tools/MaxComponent/plPickNodeComp.cpp +++ b/Sources/Tools/MaxComponent/plPickNodeComp.cpp @@ -25,10 +25,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPickNodeBase.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plComponentBase.h" #include "resource.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" #include diff --git a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp index 1a6d2208..1320d64b 100644 --- a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp +++ b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp @@ -29,13 +29,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "hsUtils.h" #include "plAutoUIBlock.h" #include "plAutoUIParams.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../MaxMain/plPluginResManager.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "MaxMain/plPluginResManager.h" +#include "pnMessage/plObjRefMsg.h" #include "plVolumeGadgetComponent.h" #include "plGUIComponents.h" #include "pfGUISkinComp.h" @@ -44,16 +44,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNotetrackAnim.h" #include "plOneShotComponent.h" #include "plMultistageBehComponent.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plInterp/plAnimEaseTypes.h" +#include "plAgeDescription/plAgeDescription.h" #include "plWaterComponent.h" -#include "../plDrawable/plWaveSetBase.h" +#include "plDrawable/plWaveSetBase.h" #include "plClusterComponent.h" -#include "../plDrawable/plClusterGroup.h" +#include "plDrawable/plClusterGroup.h" #include "plPhysicalComponents.h" -//#include "../plHavok1/plHKPhysical.h" -#include "../plAvatar/plSwimRegion.h" -#include "../../PubUtilLib/plSurface/plGrassShaderMod.h" +//#include "plHavok1/plHKPhysical.h" +#include "plAvatar/plSwimRegion.h" +#include "plSurface/plGrassShaderMod.h" #include "plGrassComponent.h" #include "notify.h" @@ -63,11 +63,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include "../pfPython/plPythonFileMod.h" -#include "../pfPython/plPythonParameter.h" +#include "pfPython/plPythonFileMod.h" +#include "pfPython/plPythonParameter.h" // for DynamicText hack to get the plKeys (could probably be removed later) -#include "../plGImage/plDynamicTextMap.h" +#include "plGImage/plDynamicTextMap.h" //// plCommonPythonLib /////////////////////////////////////////////////////// // Derived class for our global python fileMods, since they go in to the @@ -75,8 +75,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // 2.4.03 mcn - Added sceneObjects to the list, so that we can have an // associated sceneObject for our mod -#include "../MaxMain/plCommonObjLib.h" -#include "../plSDL/plSDL.h" +#include "MaxMain/plCommonObjLib.h" +#include "plSDL/plSDL.h" class plCommonPythonLib : public plCommonObjLib { diff --git a/Sources/Tools/MaxComponent/plRepComponent.cpp b/Sources/Tools/MaxComponent/plRepComponent.cpp index 25ce8199..f7cd8950 100644 --- a/Sources/Tools/MaxComponent/plRepComponent.cpp +++ b/Sources/Tools/MaxComponent/plRepComponent.cpp @@ -32,9 +32,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" #include "plMiscComponents.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportErrorMsg.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportErrorMsg.h" #include "hsResMgr.h" diff --git a/Sources/Tools/MaxComponent/plResponderAnim.cpp b/Sources/Tools/MaxComponent/plResponderAnim.cpp index 5c95122f..1908bf3e 100644 --- a/Sources/Tools/MaxComponent/plResponderAnim.cpp +++ b/Sources/Tools/MaxComponent/plResponderAnim.cpp @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plAnimComponent.h" #include "plAudioComponents.h" @@ -38,17 +38,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include // Needed for anim msg creation -#include "../pnKeyedObject/plKey.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plMessage/plAnimCmdMsg.h" #include "plNotetrackAnim.h" // Needed for sound msg creation -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" #include "plAudible.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plSoundMsg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" enum { diff --git a/Sources/Tools/MaxComponent/plResponderAnim.h b/Sources/Tools/MaxComponent/plResponderAnim.h index d7536bde..a865005a 100644 --- a/Sources/Tools/MaxComponent/plResponderAnim.h +++ b/Sources/Tools/MaxComponent/plResponderAnim.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plResponderCmd.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plComponentBase; diff --git a/Sources/Tools/MaxComponent/plResponderCmd.h b/Sources/Tools/MaxComponent/plResponderCmd.h index 1f28f80f..5c1ad585 100644 --- a/Sources/Tools/MaxComponent/plResponderCmd.h +++ b/Sources/Tools/MaxComponent/plResponderCmd.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include #include -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class ParamBlockDesc2; class IParamBlock2; diff --git a/Sources/Tools/MaxComponent/plResponderComponent.cpp b/Sources/Tools/MaxComponent/plResponderComponent.cpp index 775ec191..2c2e3b8e 100644 --- a/Sources/Tools/MaxComponent/plResponderComponent.cpp +++ b/Sources/Tools/MaxComponent/plResponderComponent.cpp @@ -29,33 +29,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plSDLTypes.h" -#include "../plModifier/plResponderModifier.h" -#include "../plModifier/plLogicModifier.h" -#include "../plModifier/plAxisAnimModifier.h" -#include "../pfConditional/plActivatorConditionalObject.h" -#include "../pfConditional/plORConditionalObject.h" +#include "plModifier/plResponderModifier.h" +#include "plModifier/plLogicModifier.h" +#include "plModifier/plAxisAnimModifier.h" +#include "pfConditional/plActivatorConditionalObject.h" +#include "pfConditional/plORConditionalObject.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNotifyMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plPickNode.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" #include "plResponderLink.h" #include "plResponderAnim.h" #include "plResponderMtl.h" #include "plResponderWait.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" IParamBlock2 *CreateWaitBlk(); diff --git a/Sources/Tools/MaxComponent/plResponderComponent.h b/Sources/Tools/MaxComponent/plResponderComponent.h index 6bb44ff4..1ea917ac 100644 --- a/Sources/Tools/MaxComponent/plResponderComponent.h +++ b/Sources/Tools/MaxComponent/plResponderComponent.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plComponentExt.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #define RESPONDER_CID Class_ID(0x46b83f3e, 0x7d5e5d17) diff --git a/Sources/Tools/MaxComponent/plResponderComponentPriv.h b/Sources/Tools/MaxComponent/plResponderComponentPriv.h index 8f1adc7a..16360fbc 100644 --- a/Sources/Tools/MaxComponent/plResponderComponentPriv.h +++ b/Sources/Tools/MaxComponent/plResponderComponentPriv.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Private header for the responder component. Anyone else should include plResponderComponent.h #include "plResponderComponent.h" #include "plComponent.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include diff --git a/Sources/Tools/MaxComponent/plResponderGetComp.cpp b/Sources/Tools/MaxComponent/plResponderGetComp.cpp index 3e921bf7..7068228e 100644 --- a/Sources/Tools/MaxComponent/plResponderGetComp.cpp +++ b/Sources/Tools/MaxComponent/plResponderGetComp.cpp @@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plMaxNodeBase.h" #include "resource.h" #include "plComponentBase.h" -#include "../MaxMain/plMaxAccelerators.h" +#include "MaxMain/plMaxAccelerators.h" plResponderGetComp& plResponderGetComp::Instance() { diff --git a/Sources/Tools/MaxComponent/plResponderLink.cpp b/Sources/Tools/MaxComponent/plResponderLink.cpp index bf2437ac..976c3c07 100644 --- a/Sources/Tools/MaxComponent/plResponderLink.cpp +++ b/Sources/Tools/MaxComponent/plResponderLink.cpp @@ -28,21 +28,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plResponderComponentPriv.h" #include "resource.h" #include "max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "hsResMgr.h" #include "plMiscComponents.h" // Needed for the dialog -#include "../MaxMain/plMaxCFGFile.h" -#include "../plFile/hsFiles.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "MaxMain/plMaxCFGFile.h" +#include "plFile/hsFiles.h" +#include "plAgeDescription/plAgeDescription.h" // Needed to create the message -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plNetCommon/plNetCommon.h" +#include "plNetCommon/plSpawnPointInfo.h" enum { diff --git a/Sources/Tools/MaxComponent/plResponderLink.h b/Sources/Tools/MaxComponent/plResponderLink.h index 136e3f7e..3cf8bc52 100644 --- a/Sources/Tools/MaxComponent/plResponderLink.h +++ b/Sources/Tools/MaxComponent/plResponderLink.h @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plResponderCmd.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plResponderCmdLink : public plResponderCmd { diff --git a/Sources/Tools/MaxComponent/plResponderMtl.cpp b/Sources/Tools/MaxComponent/plResponderMtl.cpp index 6ac1d1a5..a0f59161 100644 --- a/Sources/Tools/MaxComponent/plResponderMtl.cpp +++ b/Sources/Tools/MaxComponent/plResponderMtl.cpp @@ -29,31 +29,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" -#include "../MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "../MaxPlasmaMtls/Materials/plPassMtl.h" +#include "MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerAnimation.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerAnimation.h" #include "plMaxAnimUtils.h" #include "plNotetrackAnim.h" #include "plPickMaterialMap.h" -#include "../MaxMain/plMtlCollector.h" +#include "MaxMain/plMtlCollector.h" #include "plPickNode.h" // Needed for convert -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" #include #include #include -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" enum { diff --git a/Sources/Tools/MaxComponent/plResponderMtl.h b/Sources/Tools/MaxComponent/plResponderMtl.h index 16381b67..0d3aff96 100644 --- a/Sources/Tools/MaxComponent/plResponderMtl.h +++ b/Sources/Tools/MaxComponent/plResponderMtl.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plResponderCmd.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plMessage; class IParamBlock2; diff --git a/Sources/Tools/MaxComponent/plResponderWait.cpp b/Sources/Tools/MaxComponent/plResponderWait.cpp index bc5ff87a..372d6543 100644 --- a/Sources/Tools/MaxComponent/plResponderWait.cpp +++ b/Sources/Tools/MaxComponent/plResponderWait.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plResponderWait.h" #include "plResponderComponentPriv.h" #include "resource.h" -#include "../plModifier/plResponderModifier.h" +#include "plModifier/plResponderModifier.h" #include "plResponderLink.h" diff --git a/Sources/Tools/MaxComponent/plSeekPoint.cpp b/Sources/Tools/MaxComponent/plSeekPoint.cpp index cb534e47..8d16a53e 100644 --- a/Sources/Tools/MaxComponent/plSeekPoint.cpp +++ b/Sources/Tools/MaxComponent/plSeekPoint.cpp @@ -31,20 +31,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxMain/plMaxNode.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxMain/plMaxNode.h" #include "hsGeometry3.h" -#include "../plAvatar/plSeekPointMod.h" +#include "plAvatar/plSeekPointMod.h" //Necessary Empty function. Otherwise Linker throws the Paramblock away as extraneous. void DummyCodeIncludeFuncSeekPoint() diff --git a/Sources/Tools/MaxComponent/plShadowComponents.cpp b/Sources/Tools/MaxComponent/plShadowComponents.cpp index b899ee1f..4e1d93fd 100644 --- a/Sources/Tools/MaxComponent/plShadowComponents.cpp +++ b/Sources/Tools/MaxComponent/plShadowComponents.cpp @@ -30,20 +30,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" #include "hsTypes.h" #include "plShadowComponents.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plObjRefMsg.h" -#include "../plGLight/plLightInfo.h" -#include "../plGLight/plShadowCaster.h" -#include "../plGLight/plPointShadowMaster.h" -#include "../plGLight/plDirectShadowMaster.h" +#include "plGLight/plLightInfo.h" +#include "plGLight/plShadowCaster.h" +#include "plGLight/plPointShadowMaster.h" +#include "plGLight/plDirectShadowMaster.h" #include "hsResMgr.h" diff --git a/Sources/Tools/MaxComponent/plSmoothComponent.cpp b/Sources/Tools/MaxComponent/plSmoothComponent.cpp index d784ffb7..c99d0c00 100644 --- a/Sources/Tools/MaxComponent/plSmoothComponent.cpp +++ b/Sources/Tools/MaxComponent/plSmoothComponent.cpp @@ -30,23 +30,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "hsTypes.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableSpans.h" // The AccMeshSmooth now does everything the InterMeshSmooth and AvMeshSmooth // components did, only better and with fewer bugs. //#include "../plDrawable/plInterMeshSmooth.h" -#include "../plDrawable/plAvMeshSmooth.h" +#include "plDrawable/plAvMeshSmooth.h" -#include "../plDrawable/plAccMeshSmooth.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plDrawable/plSharedMesh.h" +#include "plDrawable/plAccMeshSmooth.h" +#include "plDrawable/plGeometrySpan.h" +#include "plDrawable/plSharedMesh.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" const Class_ID CID_SMOOTHCOMP(0x7f926cbc, 0x58df5a44); diff --git a/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp b/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp index 6a0c2092..bc3936d7 100644 --- a/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp +++ b/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp @@ -32,22 +32,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMiscComponents.h" #include "plSoftVolumeComponent.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" - -#include "../plIntersect/plSoftVolumeTypes.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plObjRefMsg.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plMaxNode.h" + +#include "plIntersect/plSoftVolumeTypes.h" +#include "plIntersect/plVolumeIsect.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plObjRefMsg.h" #include "hsResMgr.h" -#include "../plGLight/plLightInfo.h" -#include "../plScene/plOccluder.h" +#include "plGLight/plLightInfo.h" +#include "plScene/plOccluder.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plScene/plVisRegion.h" -#include "../plScene/plRelevanceRegion.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plScene/plVisRegion.h" +#include "plScene/plRelevanceRegion.h" void DummyCodeIncludeFuncSoftVolume() {} diff --git a/Sources/Tools/MaxComponent/plSoftVolumeComponent.h b/Sources/Tools/MaxComponent/plSoftVolumeComponent.h index 6ccd78c0..7f58d796 100644 --- a/Sources/Tools/MaxComponent/plSoftVolumeComponent.h +++ b/Sources/Tools/MaxComponent/plSoftVolumeComponent.h @@ -26,9 +26,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plSoftVolumeComponent_h #define _plSoftVolumeComponent_h -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" ///////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plTemplateComponent.cpp b/Sources/Tools/MaxComponent/plTemplateComponent.cpp index 8b535f30..4bd341d0 100644 --- a/Sources/Tools/MaxComponent/plTemplateComponent.cpp +++ b/Sources/Tools/MaxComponent/plTemplateComponent.cpp @@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plComponentReg.h" #include "hsTemplates.h" -#include "../MaxMain/plPluginResManager.h" -#include "../MaxMain/plMaxNode.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" +#include "MaxMain/plPluginResManager.h" +#include "MaxMain/plMaxNode.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" #include "plMiscComponents.h" diff --git a/Sources/Tools/MaxComponent/plTypesComponents.cpp b/Sources/Tools/MaxComponent/plTypesComponents.cpp index e6f428ae..65a5b405 100644 --- a/Sources/Tools/MaxComponent/plTypesComponents.cpp +++ b/Sources/Tools/MaxComponent/plTypesComponents.cpp @@ -30,25 +30,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" -#include "../pfCamera/plInterestingModifier.h" -#include "../plModifier/plSpawnModifier.h" +#include "pfCamera/plInterestingModifier.h" +#include "plModifier/plSpawnModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plScene/plSceneNode.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxMain/plMaxNode.h" +#include "plScene/plSceneNode.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxMain/plMaxNode.h" #include "hsGeometry3.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" //Necessary Empty function. Otherwise Linker throws the Paramblock away as extraneous. void DummyCodeIncludeFuncTypes() diff --git a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp index 45b82ac1..9b510bda 100644 --- a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp +++ b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp @@ -28,36 +28,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponentReg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plPhysical/plCollisionDetector.h" // MM -#include "../plModifier/plLogicModifier.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../plPhysical/plPickingDetector.h" -#include "../pfConditional/plActivatorConditionalObject.h" -#include "../pfConditional/plFacingConditionalObject.h" -#include "../pfConditional/plObjectInBoxConditionalObject.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" + +#include "plPhysical/plCollisionDetector.h" // MM +#include "plModifier/plLogicModifier.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plPickingDetector.h" +#include "pfConditional/plActivatorConditionalObject.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plCursorChangeMsg.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxConvert/plConvert.h" +#include "MaxMain/plMaxNode.h" +#include "MaxConvert/plConvert.h" #include "plResponderComponent.h" // Physics Dependencies below -#include "../MaxConvert/hsConverterUtils.h" //Conversion Dependencies +#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies #include "plPhysicalComponents.h" -#include "../pnMessage/plIntRefMsg.h" +#include "pnMessage/plIntRefMsg.h" #include "plComponentProcBase.h" -#include "../MaxMain/plPhysicalProps.h" +#include "MaxMain/plPhysicalProps.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" void DummyCodeIncludeFuncVolumeGadget() {} diff --git a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h index cb1c7a2a..8e896ae3 100644 --- a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h +++ b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plVolumeGadgetComponent_inc #include "plActivatorBaseComponent.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #define VOLUMEGADGET_CID Class_ID(0x1f77b56, 0x209a09d8) diff --git a/Sources/Tools/MaxComponent/plWaterComponent.cpp b/Sources/Tools/MaxComponent/plWaterComponent.cpp index 0f6dccd2..fec9834a 100644 --- a/Sources/Tools/MaxComponent/plWaterComponent.cpp +++ b/Sources/Tools/MaxComponent/plWaterComponent.cpp @@ -31,9 +31,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plWaterComponent.h" #include "plSoftVolumeComponent.h" @@ -41,18 +41,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plTweak.h" -#include "../plDrawable/plWaveSetBase.h" -#include "../plDrawable/plWaveSet7.h" -#include "../plDrawable/plFixedWaterState7.h" +#include "plDrawable/plWaveSetBase.h" +#include "plDrawable/plWaveSet7.h" +#include "plDrawable/plFixedWaterState7.h" -#include "../plPipeline/plDynamicEnvMap.h" +#include "plPipeline/plDynamicEnvMap.h" -#include "../MaxMain/plPluginResManager.h" +#include "MaxMain/plPluginResManager.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plObjRefMsg.h" -#include "../plScene/plVisRegion.h" +#include "plScene/plVisRegion.h" static const float kPercentToFrac(1.e-2f); static const float kDegreeToRad(hsScalarPI/180.f); diff --git a/Sources/Tools/MaxComponent/plXImposter.cpp b/Sources/Tools/MaxComponent/plXImposter.cpp index a7394d8a..fd891813 100644 --- a/Sources/Tools/MaxComponent/plXImposter.cpp +++ b/Sources/Tools/MaxComponent/plXImposter.cpp @@ -29,16 +29,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plExportProgressBar.h" #include "plXImposter.h" -#include "../pfAnimation/plFilterCoordInterface.h" +#include "pfAnimation/plFilterCoordInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plSimulationInterface.h" #include "plPhysical.h" const Class_ID FILTERINHERIT_COMP_CID(0x263928d8, 0x548456da); diff --git a/Sources/Tools/MaxConvert/CMakeLists.txt b/Sources/Tools/MaxConvert/CMakeLists.txt new file mode 100644 index 00000000..85a7d9af --- /dev/null +++ b/Sources/Tools/MaxConvert/CMakeLists.txt @@ -0,0 +1,54 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) + +set(MaxConvert_HEADERS + hsControlConverter.h + hsConverterUtils.h + hsMaterialConverter.h + hsMaxLayerBase.h + hsVertexShader.h + plBitmapCreator.h + plClusterUtil.h + plConvert.h + plDistributor.h + plDistTree.h + plLayerConverter.h + plLightMapGen.h + plMaxLightContext.h + plMeshConverter.h + plRenderGlobalContext.h + plRenderInstance.h + StringTokenizer.h + UserPropMgr.h +) + +set(MaxConvert_SOURCES + hsControlConverter.cpp + hsConverterUtils.cpp + hsMaterialConverter.cpp + hsVertexShader.cpp + plBitmapCreator.cpp + plClusterUtil.cpp + plConvert.cpp + plDistributor.cpp + plDistTree.cpp + plLayerConverter.cpp + plLightMapGen.cpp + plMeshConverter.cpp + plRenderGlobalContext.cpp + plRenderInstance.cpp + StringTokenizer.cpp + UserPropMgr.cpp +) + +add_library(MaxConvert STATIC ${MaxConvert_HEADERS} ${MaxConvert_SOURCES}) + +source_group("Header Files" FILES ${MaxConvert_HEADERS}) +source_group("Source Files" FILES ${MaxConvert_SOURCES}) diff --git a/Sources/Tools/MaxConvert/hsControlConverter.cpp b/Sources/Tools/MaxConvert/hsControlConverter.cpp index facba3e4..5f45688b 100644 --- a/Sources/Tools/MaxConvert/hsControlConverter.cpp +++ b/Sources/Tools/MaxConvert/hsControlConverter.cpp @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include //#include "Max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "stdmat.h" #include "bmmlib.h" #include "istdplug.h" @@ -40,20 +40,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsMaxLayerBase.h" -#include "../../../Sources/Plasma/PubUtilLib/plInterp/plController.h" -#include "../../../Sources/Plasma/PubUtilLib/plInterp/hsInterp.h" -#include "../MaxExport/plErrorMsg.h" +#include "plInterp/plController.h" +#include "plInterp/hsInterp.h" +#include "MaxExport/plErrorMsg.h" #include "UserPropMgr.h" #include "hsConverterUtils.h" #include "hsControlConverter.h" #include "hsMaterialConverter.h" #include "hsExceptionStack.h" -#include "../MaxExport/plErrorMsg.h" -#include "../../Tools/MaxComponent/plNoteTrackAnim.h" -#include "../MaxComponent/plCameraComponents.h" -#include "../MaxComponent/plAnimComponent.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "MaxExport/plErrorMsg.h" +#include "MaxComponent/plNoteTrackAnim.h" +#include "MaxComponent/plCameraComponents.h" +#include "MaxComponent/plAnimComponent.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" extern UserPropMgr gUserPropMgr; diff --git a/Sources/Tools/MaxConvert/hsControlConverter.h b/Sources/Tools/MaxConvert/hsControlConverter.h index 3f918422..3c5a4f99 100644 --- a/Sources/Tools/MaxConvert/hsControlConverter.h +++ b/Sources/Tools/MaxConvert/hsControlConverter.h @@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "bmmlib.h" #include "istdplug.h" #include "texutil.h" -#include "../../../Sources/Plasma/PubUtilLib/plInterp/hsKeys.h" +#include "plInterp/hsKeys.h" #include "hsTemplates.h" class plMaxNode; diff --git a/Sources/Tools/MaxConvert/hsConverterUtils.cpp b/Sources/Tools/MaxConvert/hsConverterUtils.cpp index 52b757e4..647e4815 100644 --- a/Sources/Tools/MaxConvert/hsConverterUtils.cpp +++ b/Sources/Tools/MaxConvert/hsConverterUtils.cpp @@ -33,19 +33,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "hsMaxLayerBase.h" -#include "../plInterp/plController.h" +#include "plInterp/plController.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" #include "UserPropMgr.h" #include "hsStringTokenizer.h" //#include "hsDXTDirectXCodec.h" //#include "hsDXTSoftwareCodec.h" -#include "../plGImage/hsCodecManager.h" +#include "plGImage/hsCodecManager.h" ///#include "SwitchUtil.h" #include "hsExceptionStack.h" #include "hsHashTable.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" const char hsConverterUtils::fTagSeps[] = " ,\t\n=:;"; @@ -308,7 +308,7 @@ INode* hsConverterUtils::FindINodeFromMangledName(const char* mangName) const char* nodeName = mangName; char* p; - while( p = strstr(nodeName, "..") ) + while( p = strstr((char*)nodeName, "..") ) { nodeName = p + 2; } @@ -355,7 +355,7 @@ char *hsConverterUtils::UnMangleReference(char *dest, const char *name) { hsGuardBegin("hsConverterUtils::IsMangled"); - char *u = strstr(name,".."); + char *u = strstr((char*)name,".."); if (u) { u+=2; @@ -380,7 +380,7 @@ char* hsConverterUtils::StripMangledReference(char* dest, const char* name) { hsGuardBegin("hsConverterUtils::StripMangledReference"); - char *u = strstr(name,".."); + char *u = strstr((char*)name,".."); if (u) { u+=2; @@ -527,7 +527,9 @@ UInt32 hsConverterUtils::CacheNode::GetHash() const { const char* k = GetName(); int len = k ? strlen(k) : 0; - for (int h=len; len--;) + + int h; + for (h=len; len--;) { h = ((h<<5)^(h>>27))^tolower(*k++); } diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp index e04deece..35c0ea4a 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp @@ -36,69 +36,69 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMaterialConverter.h" #include "plLayerConverter.h" -#include "../MaxComponent/plMaxAnimUtils.h" -#include "../plResMgr/plKeyFinder.h" +#include "MaxComponent/plMaxAnimUtils.h" +#include "plResMgr/plKeyFinder.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "hsUtils.h" #include "hsMaxLayerBase.h" -#include "../MaxExport/plErrorMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../pnSceneObject/plSceneObject.h" +#include "MaxExport/plErrorMsg.h" +#include "plSurface/hsGMaterial.h" +#include "pnSceneObject/plSceneObject.h" #include "UserPropMgr.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" #include "hsConverterUtils.h" #include "hsControlConverter.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" -#include "../plInterp/plController.h" +#include "plInterp/plController.h" #include "hsExceptionStack.h" #include "hsStringTokenizer.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/plLayerAnimation.h" -#include "../plGImage/plMipmap.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/plLayerAnimation.h" +#include "plGImage/plMipmap.h" #include "plgDispatch.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "pnMessage/plRefMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" #include "plBitmapCreator.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pfMessage/plClothingMsg.h" - -#include "../MaxPlasmaMtls/Materials/plMultipassMtlPB.h" -#include "../MaxPlasmaMtls/Materials/plCompositeMtlPB.h" -#include "../MaxPlasmaMtls/Materials/plPassMtl.h" -#include "../MaxPlasmaMtls/Materials/plMultipassMtl.h" -#include "../MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "../MaxPlasmaMtls/Materials/plCompositeMtl.h" -#include "../MaxPlasmaMtls/Materials/plParticleMtl.h" -#include "../MaxPlasmaMtls/Materials/plBumpMtl.h" -#include "../MaxPlasmaMtls/Materials/plPassMtlBase.h" -#include "../MaxPlasmaMtls/Materials/plAnimStealthNode.h" -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" - -#include "../pfSurface/plLayerAVI.h" -#include "../pfSurface/plLayerBink.h" - -#include "../MaxComponent/plLightMapComponent.h" -#include "../plDrawable/plGeometrySpan.h" - -#include "../MaxPlasmaMtls/Materials/plClothingMtl.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plClothingLayout.h" -#include "../plSDL/plSDL.h" -#include "../plSDL/plSDLDescriptor.h" +#include "plMessage/plMatRefMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pfMessage/plClothingMsg.h" + +#include "MaxPlasmaMtls/Materials/plMultipassMtlPB.h" +#include "MaxPlasmaMtls/Materials/plCompositeMtlPB.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" +#include "MaxPlasmaMtls/Materials/plMultipassMtl.h" +#include "MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxPlasmaMtls/Materials/plCompositeMtl.h" +#include "MaxPlasmaMtls/Materials/plParticleMtl.h" +#include "MaxPlasmaMtls/Materials/plBumpMtl.h" +#include "MaxPlasmaMtls/Materials/plPassMtlBase.h" +#include "MaxPlasmaMtls/Materials/plAnimStealthNode.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" + +#include "pfSurface/plLayerAVI.h" +#include "pfSurface/plLayerBink.h" + +#include "MaxComponent/plLightMapComponent.h" +#include "plDrawable/plGeometrySpan.h" + +#include "MaxPlasmaMtls/Materials/plClothingMtl.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plClothingLayout.h" +#include "plSDL/plSDL.h" +#include "plSDL/plSDLDescriptor.h" extern UserPropMgr gUserPropMgr; @@ -1678,10 +1678,10 @@ hsGMaterial *hsMaterialConverter::IProcessMultipassMtl(Mtl *mtl, plMaxNode *node layerCounts[i] = mat->GetNumLayers(); } - for (i = mtl->NumSubMtls() - 1; i > 0; i--) + for (int i = mtl->NumSubMtls() - 1; i > 0; i--) layerCounts[i] -= layerCounts[i - 1]; - for (i = 0; i < mtl->NumSubMtls(); i++) + for (int i = 0; i < mtl->NumSubMtls(); i++) pb->SetValue(kMultLayerCounts, 0, (int)layerCounts[i], i); delete [] layerCounts; @@ -4520,7 +4520,7 @@ plClothingItem *hsMaterialConverter::GenerateClothingItem(plClothingMtl *mtl, co cloth->SetName(mtl->GetName()); cloth->fSortOrder = (mtl->GetDefault() ? 0 : 1); - char *accName = mtl->GetForcedAccessoryName(); + const char *accName = mtl->GetForcedAccessoryName(); if (accName && strcmp(accName, "")) cloth->fAccessoryName = hsStrcpy(accName); diff --git a/Sources/Tools/MaxConvert/hsVertexShader.cpp b/Sources/Tools/MaxConvert/hsVertexShader.cpp index 784646cb..6c38f338 100644 --- a/Sources/Tools/MaxConvert/hsVertexShader.cpp +++ b/Sources/Tools/MaxConvert/hsVertexShader.cpp @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "dummy.h" #include "notetrck.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "hsBitVector.h" #include "hsMatrix44.h" #include "hsTemplates.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" #include "UserPropMgr.h" #include "hsMaxLayerBase.h" @@ -57,10 +57,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConverterUtils.h" #include "hsControlConverter.h" #include "hsExceptionStack.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plDrawable/plGeometrySpan.h" #include "plMaxLightContext.h" #include "plRenderGlobalContext.h" diff --git a/Sources/Tools/MaxConvert/plBitmapCreator.cpp b/Sources/Tools/MaxConvert/plBitmapCreator.cpp index 211d075b..00b42317 100644 --- a/Sources/Tools/MaxConvert/plBitmapCreator.cpp +++ b/Sources/Tools/MaxConvert/plBitmapCreator.cpp @@ -28,30 +28,30 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "bmmlib.h" -#include "../../Plasma/PubUtilLib/plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #include "hsExceptionStack.h" -#include "../../Plasma/PubUtilLib/plGImage/hsCodecManager.h" +#include "plGImage/hsCodecManager.h" #include "plBitmapCreator.h" -#include "../MaxMain/plPluginResManager.h" -#include "../MaxExport/plErrorMsg.h" -#include "../MaxPlasmaMtls/Layers/plStaticEnvLayer.h" +#include "MaxMain/plPluginResManager.h" +#include "MaxExport/plErrorMsg.h" +#include "MaxPlasmaMtls/Layers/plStaticEnvLayer.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plLocalization.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plGImage/plCubicEnvironmap.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plLocalization.h" +#include "plAgeDescription/plAgeDescription.h" //// plCommonBitmapLib /////////////////////////////////////////////////////// // Derived class for our textures, since they all go in a common page // (namely, "Textures") -#include "../MaxMain/plCommonObjLib.h" +#include "MaxMain/plCommonObjLib.h" class plCommonBitmapLib : public plCommonObjLib { diff --git a/Sources/Tools/MaxConvert/plBitmapCreator.h b/Sources/Tools/MaxConvert/plBitmapCreator.h index 79a45bb7..9b129f81 100644 --- a/Sources/Tools/MaxConvert/plBitmapCreator.h +++ b/Sources/Tools/MaxConvert/plBitmapCreator.h @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class BitmapInfo; class Bitmap; diff --git a/Sources/Tools/MaxConvert/plClusterUtil.cpp b/Sources/Tools/MaxConvert/plClusterUtil.cpp index da43c723..5868903e 100644 --- a/Sources/Tools/MaxConvert/plClusterUtil.cpp +++ b/Sources/Tools/MaxConvert/plClusterUtil.cpp @@ -38,32 +38,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include "../MaxMain/plMaxNode.h" -#include "../MaxComponent/plComponent.h" -#include "../MaxComponent/plLightGrpComponent.h" -#include "../MaxComponent/plSoftVolumeComponent.h" +#include "MaxMain/plMaxNode.h" +#include "MaxComponent/plComponent.h" +#include "MaxComponent/plLightGrpComponent.h" +#include "MaxComponent/plSoftVolumeComponent.h" #include "plClusterUtil.h" -#include "../plDrawable/plClusterGroup.h" -#include "../plDrawable/plCluster.h" -#include "../plDrawable/plSpanTemplate.h" -#include "../plDrawable/plSpanInstance.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plDrawable/plClusterGroup.h" +#include "plDrawable/plCluster.h" +#include "plDrawable/plSpanTemplate.h" +#include "plDrawable/plSpanInstance.h" +#include "plDrawable/plGeometrySpan.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plScene/plVisRegion.h" -#include "../plGLight/plLightInfo.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plScene/plVisRegion.h" +#include "plGLight/plLightInfo.h" #include "plMeshConverter.h" #include "hsVertexShader.h" #include "plLightMapGen.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "plTweak.h" diff --git a/Sources/Tools/MaxConvert/plClusterUtil.h b/Sources/Tools/MaxConvert/plClusterUtil.h index e251de49..d1a15f53 100644 --- a/Sources/Tools/MaxConvert/plClusterUtil.h +++ b/Sources/Tools/MaxConvert/plClusterUtil.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsColorRGBA.h" -#include "../plDrawable/plSpanInstance.h" +#include "plDrawable/plSpanInstance.h" class plMaxNode; class plClusterGroup; diff --git a/Sources/Tools/MaxConvert/plConvert.cpp b/Sources/Tools/MaxConvert/plConvert.cpp index d0e4976e..c39d7daa 100644 --- a/Sources/Tools/MaxConvert/plConvert.cpp +++ b/Sources/Tools/MaxConvert/plConvert.cpp @@ -46,25 +46,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLayerConverter.h" #include "UserPropMgr.h" #include "hsStringTokenizer.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" #include "hsVertexShader.h" #include "plLightMapGen.h" #include "plBitmapCreator.h" #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" -#include "../MaxComponent/plComponent.h" -#include "../MaxMain/plMaxNode.h" -#include "../plMessage/plNodeCleanupMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../MaxComponent/plClusterComponent.h" +#include "pnMessage/plTimeMsg.h" +#include "MaxComponent/plComponent.h" +#include "MaxMain/plMaxNode.h" +#include "plMessage/plNodeCleanupMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "MaxComponent/plClusterComponent.h" -#include "../plPhysX/plSimulationMgr.h" -#include "../MaxMain/plPhysXCooking.h" -#include "../MaxExport/plExportProgressBar.h" +#include "plPhysX/plSimulationMgr.h" +#include "MaxMain/plPhysXCooking.h" +#include "MaxExport/plExportProgressBar.h" #include "hsUtils.h" -#include "../MaxMain/plGetLocationDlg.h" +#include "MaxMain/plGetLocationDlg.h" #ifdef HS_DEBUGGING #define HS_NO_TRY @@ -113,87 +113,87 @@ hsBool plConvert::Convert() if(IOK()) { bar.Start("Clear Old Data"); - retVal = pNode->DoAllRecur( plMaxNode::ClearData, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoAllRecur( &plMaxNode::ClearData, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Convert Validate"); - retVal = pNode->DoRecur( plMaxNode::ConvertValidate, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::ConvertValidate, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Components Initialize"); - retVal = pNode->DoRecur( plMaxNode::SetupPropertiesPass, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::SetupPropertiesPass, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Prepare for skinning"); - retVal = pNode->DoRecur( plMaxNode::PrepareSkin, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::PrepareSkin, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Make Scene Object"); - retVal = pNode->DoRecur( plMaxNode::MakeSceneObject, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeSceneObject, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Make Physical"); plPhysXCooking::Init(); - retVal = pNode->DoRecur( plMaxNode::MakePhysical, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakePhysical, fpErrorMsg, fSettings, &bar ); plPhysXCooking::Shutdown(); } if(IOK()) { bar.Start("Component Preconvert"); - retVal = pNode->DoRecur( plMaxNode::FirstComponentPass, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::FirstComponentPass, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Make Controller"); - retVal = pNode->DoRecur( plMaxNode::MakeController, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeController, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // must be before mesh bar.Start("Make Coord Interface"); - retVal = pNode->DoRecur( plMaxNode::MakeCoordinateInterface, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeCoordinateInterface, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // must be after coord interface but before pool data is created. bar.Start("Make Connections"); - retVal = pNode->DoRecur( plMaxNode::MakeParentOrRoomConnection, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeParentOrRoomConnection, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // must be before simulation bar.Start("Make Mesh"); - retVal = pNode->DoRecur( plMaxNode::MakeMesh, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeMesh, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // doesn't matter when bar.Start("Make Light"); - retVal = pNode->DoRecur( plMaxNode::MakeLight, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeLight, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // doesn't matter when bar.Start("Make Occluder"); - retVal = pNode->DoRecur( plMaxNode::MakeOccluder, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeOccluder, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // must be after mesh bar.Start("Make Modifiers"); - retVal = pNode->DoRecur( plMaxNode::MakeModifiers, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeModifiers, fpErrorMsg, fSettings, &bar ); } if(IOK()) { bar.Start("Convert Components"); - retVal = pNode->DoRecur( plMaxNode::ConvertComponents, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::ConvertComponents, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // do this after convert bar.Start("Set Up Interface References"); - retVal = pNode->DoRecur( plMaxNode::MakeIfaceReferences, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::MakeIfaceReferences, fpErrorMsg, fSettings, &bar ); } if(IOK() && fSettings->fDoPreshade) @@ -203,7 +203,7 @@ hsBool plConvert::Convert() hsVertexShader::Instance().Open(); bar.Start("Preshade Geometry"); - retVal = pNode->DoRecur( plMaxNode::ShadeMesh, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::ShadeMesh, fpErrorMsg, fSettings, &bar ); plLightMapGen::Instance().Close(); hsVertexShader::Instance().Close(); @@ -213,13 +213,13 @@ hsBool plConvert::Convert() { // Do this next-to-last--allows all the components to free up any temp data they kept around bar.Start("Component DeInit"); - retVal = pNode->DoRecur( plMaxNode::DeInitComponents, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoRecur( &plMaxNode::DeInitComponents, fpErrorMsg, fSettings, &bar ); } if(IOK()) { // Do this very last--it de-inits and frees all the maxNodeDatas lying around bar.Start("Clear MaxNodeDatas"); - retVal = pNode->DoAllRecur( plMaxNode::ClearMaxNodeData, fpErrorMsg, fSettings, &bar ); + retVal = pNode->DoAllRecur( &plMaxNode::ClearMaxNodeData, fpErrorMsg, fSettings, &bar ); } // fpErrorMsg->Set(); @@ -275,42 +275,42 @@ hsBool plConvert::Convert(hsTArray& nodes) hsBool retVal = true; if (IOK()) - retVal = ConvertList(nodes, plMaxNode::ClearData, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::ClearData, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::ConvertValidate, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::ConvertValidate, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::SetupPropertiesPass, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::SetupPropertiesPass, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::PrepareSkin, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::PrepareSkin, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::MakeSceneObject, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::MakeSceneObject, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::FirstComponentPass, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::FirstComponentPass, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::MakeController, fpErrorMsg,fSettings); + retVal = ConvertList(nodes, &plMaxNode::MakeController, fpErrorMsg,fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::MakeCoordinateInterface, fpErrorMsg, fSettings);// must be before mesh + retVal = ConvertList(nodes, &plMaxNode::MakeCoordinateInterface, fpErrorMsg, fSettings);// must be before mesh if(IOK()) - retVal = ConvertList(nodes, plMaxNode::MakeParentOrRoomConnection, fpErrorMsg, fSettings); // after coord, before mesh (or any other pool data). + retVal = ConvertList(nodes, &plMaxNode::MakeParentOrRoomConnection, fpErrorMsg, fSettings); // after coord, before mesh (or any other pool data). // These shouldn't be opened until the components have had a chance to flag the MaxNodes plLightMapGen::Instance().Open(fInterface, fInterface->GetTime(), fSettings->fDoLightMap); hsVertexShader::Instance().Open(); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::MakeMesh, fpErrorMsg, fSettings); // must be before simulation + retVal = ConvertList(nodes, &plMaxNode::MakeMesh, fpErrorMsg, fSettings); // must be before simulation if(IOK()) // doesn't matter when - retVal = ConvertList(nodes, plMaxNode::MakeLight, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::MakeLight, fpErrorMsg, fSettings); if(IOK()) // doesn't matter when - retVal = ConvertList(nodes, plMaxNode::MakeOccluder, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::MakeOccluder, fpErrorMsg, fSettings); if(IOK()) // must be after mesh - retVal = ConvertList(nodes, plMaxNode::MakeModifiers, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::MakeModifiers, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::ConvertComponents, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::ConvertComponents, fpErrorMsg, fSettings); if(IOK()) - retVal = ConvertList(nodes, plMaxNode::ShadeMesh, fpErrorMsg, fSettings); + retVal = ConvertList(nodes, &plMaxNode::ShadeMesh, fpErrorMsg, fSettings); // These may be used by components, so don't close them till the end. plLightMapGen::Instance().Close(); diff --git a/Sources/Tools/MaxConvert/plConvert.h b/Sources/Tools/MaxConvert/plConvert.h index d10e8157..77d34d2a 100644 --- a/Sources/Tools/MaxConvert/plConvert.h +++ b/Sources/Tools/MaxConvert/plConvert.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plErrorMsg; class plLocation; diff --git a/Sources/Tools/MaxConvert/plDistributor.cpp b/Sources/Tools/MaxConvert/plDistributor.cpp index a46d9001..14aa16f4 100644 --- a/Sources/Tools/MaxConvert/plDistributor.cpp +++ b/Sources/Tools/MaxConvert/plDistributor.cpp @@ -33,19 +33,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamb2.h" #include "meshdlib.h" -#include "../MaxExport/plExportProgressBar.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxExport/plExportProgressBar.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" #include "hsMaterialConverter.h" #include "hsTypes.h" #include "hsGeometry3.h" #include "hsUtils.h" -#include "../plMath/plTriUtils.h" +#include "plMath/plTriUtils.h" #include "plDistributor.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plDistTree.h" diff --git a/Sources/Tools/MaxConvert/plDistributor.h b/Sources/Tools/MaxConvert/plDistributor.h index b661a906..fccbe4d4 100644 --- a/Sources/Tools/MaxConvert/plDistributor.h +++ b/Sources/Tools/MaxConvert/plDistributor.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDistributor_inc #define plDistributor_inc -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "plDistTree.h" class INode; diff --git a/Sources/Tools/MaxConvert/plLayerConverter.cpp b/Sources/Tools/MaxConvert/plLayerConverter.cpp index bfe24522..89f3c78c 100644 --- a/Sources/Tools/MaxConvert/plLayerConverter.cpp +++ b/Sources/Tools/MaxConvert/plLayerConverter.cpp @@ -54,48 +54,48 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLayerConverter.h" -#include "../MaxConvert/hsMaxLayerBase.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plBitmapCreator.h" +#include "MaxConvert/hsMaxLayerBase.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plBitmapCreator.h" #include "hsResMgr.h" -#include "../MaxExport/plErrorMsg.h" -#include "../MaxMain/plMaxNode.h" - -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../plDrawable/plGeometrySpan.h" - -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plPipeline/plCubicRenderTarget.h" -#include "../plPipeline/plCubicRenderTargetModifier.h" -#include "../plPipeline/plDynamicEnvMap.h" - -#include "../pfSurface/plLayerAVI.h" -#include "../pfSurface/plLayerBink.h" - -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBasicPB.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" -#include "../MaxPlasmaMtls/Layers/plStaticEnvLayer.h" -#include "../MaxPlasmaMtls/Layers/plDynamicEnvLayer.h" -#include "../MaxPlasmaMtls/Layers/plDynamicTextLayer.h" -#include "../MaxPlasmaMtls/Layers/plAngleAttenLayer.h" -#include "../MaxPlasmaMtls/Layers/plMAXCameraLayer.h" - -#include "../MaxComponent/plComponent.h" -#include "../MaxComponent/plWaterComponent.h" -#include "../pfCamera/plCameraModifier.h" +#include "MaxExport/plErrorMsg.h" +#include "MaxMain/plMaxNode.h" + +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "plDrawable/plGeometrySpan.h" + +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plPipeline/plCubicRenderTarget.h" +#include "plPipeline/plCubicRenderTargetModifier.h" +#include "plPipeline/plDynamicEnvMap.h" + +#include "pfSurface/plLayerAVI.h" +#include "pfSurface/plLayerBink.h" + +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBasicPB.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" +#include "MaxPlasmaMtls/Layers/plStaticEnvLayer.h" +#include "MaxPlasmaMtls/Layers/plDynamicEnvLayer.h" +#include "MaxPlasmaMtls/Layers/plDynamicTextLayer.h" +#include "MaxPlasmaMtls/Layers/plAngleAttenLayer.h" +#include "MaxPlasmaMtls/Layers/plMAXCameraLayer.h" + +#include "MaxComponent/plComponent.h" +#include "MaxComponent/plWaterComponent.h" +#include "pfCamera/plCameraModifier.h" //// Local Static Stuff /////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxConvert/plLightMapGen.cpp b/Sources/Tools/MaxConvert/plLightMapGen.cpp index 49fec4d8..730231a2 100644 --- a/Sources/Tools/MaxConvert/plLightMapGen.cpp +++ b/Sources/Tools/MaxConvert/plLightMapGen.cpp @@ -32,29 +32,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "notify.h" #include "plLightMapGen.h" -#include "../plGImage/plMipmap.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plErrorMsg.h" +#include "plGImage/plMipmap.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plErrorMsg.h" #include "plRenderGlobalContext.h" #include "plMaxLightContext.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../MaxMain/plPluginResManager.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "MaxMain/plPluginResManager.h" +#include "plDrawable/plGeometrySpan.h" #include "hsFastMath.h" #include "hsControlConverter.h" #include "plBitmapCreator.h" -#include "../pnKeyedObject/plKey.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "pnKeyedObject/plKey.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" -#include "../plMessage/plLayRefMsg.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "plMessage/plMatRefMsg.h" -#include "../MaxComponent/plLightMapComponent.h" +#include "MaxComponent/plLightMapComponent.h" -#include "../plGImage/hsCodecManager.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plGImage/hsCodecManager.h" +#include "plAgeDescription/plAgeDescription.h" static plLightMapGen theLMG; diff --git a/Sources/Tools/MaxConvert/plMeshConverter.cpp b/Sources/Tools/MaxConvert/plMeshConverter.cpp index fe7d561d..484feaa5 100644 --- a/Sources/Tools/MaxConvert/plMeshConverter.cpp +++ b/Sources/Tools/MaxConvert/plMeshConverter.cpp @@ -42,32 +42,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../CoreLib/hsBitVector.h" +#include "hsBitVector.h" #include "plMeshConverter.h" #include "hsResMgr.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxExport/plErrorMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plDrawable/plGeometrySpan.h" +#include "MaxMain/plMaxNode.h" +#include "MaxExport/plErrorMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plDrawable/plGeometrySpan.h" #include "hsConverterUtils.h" #include "hsMaterialConverter.h" #include "hsControlConverter.h" #include "hsExceptionStack.h" -#include "../MaxPlasmaMtls/Materials/plCompositeMtl.h" -#include "../MaxPlasmaMtls/Materials/plPassMtl.h" -#include "../MaxPlasmaMtls/Materials/plCompositeMtlPB.h" -#include "../MaxPlasmaMtls/Materials/plPassMtlBasicPB.h" -#include "../plPipeline/plGBufferGroup.h" -#include "../plParticleSystem/plConvexVolume.h" -#include "../plDrawable/plGeoSpanDice.h" - -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAccessTriSpan.h" -#include "../plDrawable/plAccessVtxSpan.h" - -#include "../plStatusLog/plStatusLog.h" +#include "MaxPlasmaMtls/Materials/plCompositeMtl.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" +#include "MaxPlasmaMtls/Materials/plCompositeMtlPB.h" +#include "MaxPlasmaMtls/Materials/plPassMtlBasicPB.h" +#include "plPipeline/plGBufferGroup.h" +#include "plParticleSystem/plConvexVolume.h" +#include "plDrawable/plGeoSpanDice.h" + +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessTriSpan.h" +#include "plDrawable/plAccessVtxSpan.h" + +#include "plStatusLog/plStatusLog.h" #include "plTweak.h" diff --git a/Sources/Tools/MaxConvert/plRenderGlobalContext.cpp b/Sources/Tools/MaxConvert/plRenderGlobalContext.cpp index f436ae1f..54e8a599 100644 --- a/Sources/Tools/MaxConvert/plRenderGlobalContext.cpp +++ b/Sources/Tools/MaxConvert/plRenderGlobalContext.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "Max.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNode.h" #include "plRenderGlobalContext.h" plRenderGlobalContext::plRenderGlobalContext(Interface* ip, TimeValue t) diff --git a/Sources/Tools/MaxExport/CMakeLists.txt b/Sources/Tools/MaxExport/CMakeLists.txt new file mode 100644 index 00000000..fb4a2e3c --- /dev/null +++ b/Sources/Tools/MaxExport/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(MaxExport_HEADERS + plErrorMsg.h + plExportDlg.h + plExportErrorMsg.h + plExportLogErrorMsg.h + plExportProgressBar.h + plProgressBar.h + SimpleExport.h +) + +set(MaxExport_SOURCES + plErrorMsg.cpp + plExportDlg.cpp + plExportErrorMsg.cpp + plExportLogErrorMsg.cpp + plExportProgressBar.cpp + SimpleExport.cpp +) + +add_library(MaxExport STATIC ${MaxExport_HEADERS} ${MaxExport_SOURCES}) + +source_group("Header Files" FILES ${MaxExport_HEADERS}) +source_group("Source Files" FILES ${MaxExport_SOURCES}) diff --git a/Sources/Tools/MaxExport/SimpleExport.cpp b/Sources/Tools/MaxExport/SimpleExport.cpp index 42682893..4bdec8fd 100644 --- a/Sources/Tools/MaxExport/SimpleExport.cpp +++ b/Sources/Tools/MaxExport/SimpleExport.cpp @@ -34,38 +34,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plExportErrorMsg.h" #include "plExportLogErrorMsg.h" -#include "../MaxConvert/UserPropMgr.h" +#include "MaxConvert/UserPropMgr.h" #include "hsExceptionStack.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/plBitmapCreator.h" -#include "../pfPython/plPythonFileMod.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/plBitmapCreator.h" +#include "pfPython/plPythonFileMod.h" -#include "../MaxMain/plPluginResManager.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plRegistryNode.h" +#include "MaxMain/plPluginResManager.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plRegistryNode.h" #include "hsStream.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsMaterialConverter.h" -#include "../plPhysX/plSimulationMgr.h" -#include "../plSDL/plSDL.h" -#include "../MaxMain/plMaxCFGFile.h" +#include "plPhysX/plSimulationMgr.h" +#include "plSDL/plSDL.h" +#include "MaxMain/plMaxCFGFile.h" // For texture export/cleanup -#include "../MaxMain/plTextureExportLog.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plGImage/plMipmap.h" -#include "../plScene/plSceneNode.h" +#include "MaxMain/plTextureExportLog.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plGImage/plMipmap.h" +#include "plScene/plSceneNode.h" #include "plExportDlg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plFile/plFileUtils.h" +#include "plStatusLog/plStatusLog.h" +#include "plFile/plFileUtils.h" -#include "../plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvatarMgr.h" extern UserPropMgr gUserPropMgr; diff --git a/Sources/Tools/MaxExport/SimpleExport.h b/Sources/Tools/MaxExport/SimpleExport.h index e6251038..53316626 100644 --- a/Sources/Tools/MaxExport/SimpleExport.h +++ b/Sources/Tools/MaxExport/SimpleExport.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define __SIMPLEEXPORT_H #include "hsWindows.h" -#include "../MaxMain/resource.h" +#include "MaxMain/resource.h" #include "Max.h" #include "HeadSpin.h" diff --git a/Sources/Tools/MaxExport/plExportDlg.cpp b/Sources/Tools/MaxExport/plExportDlg.cpp index 1fb12918..c4ca0d15 100644 --- a/Sources/Tools/MaxExport/plExportDlg.cpp +++ b/Sources/Tools/MaxExport/plExportDlg.cpp @@ -26,10 +26,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsTypes.h" #include "plExportDlg.h" -#include "../MaxMain/resource.h" +#include "MaxMain/resource.h" #include "max.h" -#include "../MaxMain/plMaxCFGFile.h" +#include "MaxMain/plMaxCFGFile.h" #include #include @@ -130,9 +130,9 @@ const char* plExportDlgImp::GetExportPage() return fExportPage; } -#include "../MaxComponent/plComponentBase.h" -#include "../MaxComponent/plMiscComponents.h" -#include "../MaxMain/plMaxNode.h" +#include "MaxComponent/plComponentBase.h" +#include "MaxComponent/plMiscComponents.h" +#include "MaxMain/plMaxNode.h" #include "hsStlSortUtils.h" #include @@ -218,7 +218,7 @@ void plExportDlgImp::IInitDlg(HWND hDlg) SetDlgItemText(hDlg, IDC_EXPORT_PATH, fExportSourceDir); } -#include "../plFile/plBrowseFolder.h" +#include "plFile/plBrowseFolder.h" BOOL plExportDlgImp::DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -309,7 +309,7 @@ void plExportDlgImp::IExportCurrentFile(const char* exportPath) GetCOREInterface()->ExportToFile(exportPath); } -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" void plExportDlgImp::IDoExport() { diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt new file mode 100644 index 00000000..1a5b61bf --- /dev/null +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -0,0 +1,197 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${PHYSX_INCLUDE_DIRS}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(MaxMain_HEADERS + GlobalUtility.h + MaxAllocDll.h + plActionTableMgr.h + plAgeDescInterface.h + plCommonObjLib.h + plComponentDlg.h + plComponentPanel.h + plGetLocationDlg.h + plMaxAccelerators.h + plMaxCFGFile.h + plMaxMenu.h + plMaxMeshExtractor.h + plMaxNode.h + plMaxNodeBase.h + plMaxNodeData.h + plMaxUtils.h + plMtlCollector.h + plNodeLock.h + plPhysicalProps.h + plPhysXCooking.h + plPlasmaRefMsgs.h + plPluginResManager.h + plPythonMgr.h + plResCollector.h + plResetXform.h + plSaveSelected.h + plTextureExportLog.h + plTextureSearch.h +) + +set(MaxMain_RESOURCES + resource.h + SimpleExport.rc +) + +set(MaxMain_SOURCES + GlobalUtility.cpp + indexes.cpp + main.cpp + MaxAllocDll.cpp + plActionTableMgr.cpp + plAgeDescInterface.cpp + plCommonObjLib.cpp + plComponentDlg.cpp + plComponentPanel.cpp + plGetLocationDlg.cpp + plMaxAccelerators.cpp + plMaxCFGFile.cpp + plMaxMenu.cpp + plMaxMeshExtractor.cpp + plMaxNode.cpp + plMaxNodeBase.cpp + plMaxUtils.cpp + plMtlCollector.cpp + plNodeLock.cpp + plPhysicalProps.cpp + plPhysXCooking.cpp + plPluginResManager.cpp + plPythonMgr.cpp + plResCollector.cpp + plResetXform.cpp + plSaveSelected.cpp + plTextureExportLog.cpp + plTextureSearch.cpp +) + +add_library(MaxMain SHARED ${MaxMain_HEADERS} ${MaxMain_RESOURCES} ${MaxMain_SOURCES}) +set_target_properties(MaxMain PROPERTIES SUFFIX ".dlo") + + +target_link_libraries(MaxMain MaxComponent) +target_link_libraries(MaxMain MaxConvert) +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 debug ${PYTHON_DEBUG_LIBRARY}) +target_link_libraries(MaxMain optimized ${PYTHON_LIBRARY}) +target_link_libraries(MaxMain ${OPENAL_LIBRARY}) +target_link_libraries(MaxMain ${OPENSSL_LIBRARIES}) +target_link_libraries(MaxMain ${PHYSX_LIBRARIES}) + +# Carbon copy from plClient +# TODO: Maybe see if some of these can be removed? +target_link_libraries(MaxMain CoreLib) +target_link_libraries(MaxMain CoreLibExe) +target_link_libraries(MaxMain pfAnimation) +target_link_libraries(MaxMain pfAudio) +target_link_libraries(MaxMain pfCamera) +target_link_libraries(MaxMain pfCCR) +target_link_libraries(MaxMain pfCharacter) +target_link_libraries(MaxMain pfConditional) +target_link_libraries(MaxMain pfConsole) +target_link_libraries(MaxMain pfCsrSrv) +target_link_libraries(MaxMain pfGameGUIMgr) +target_link_libraries(MaxMain pfGameMgr) +target_link_libraries(MaxMain pfGameScoreMgr) +target_link_libraries(MaxMain pfJournalBook) +target_link_libraries(MaxMain pfLocalizationMgr) +target_link_libraries(MaxMain pfMessage) +target_link_libraries(MaxMain pfPython) +target_link_libraries(MaxMain pfSecurePreloader) +target_link_libraries(MaxMain pfStackTrace) +target_link_libraries(MaxMain pfSurface) +target_link_libraries(MaxMain plAgeDescription) +target_link_libraries(MaxMain plAgeLoader) +target_link_libraries(MaxMain plAudible) +target_link_libraries(MaxMain plAudio) +target_link_libraries(MaxMain plAudioCore) +target_link_libraries(MaxMain plAvatar) +target_link_libraries(MaxMain plCompression) +target_link_libraries(MaxMain plContainer) +target_link_libraries(MaxMain plDrawable) +target_link_libraries(MaxMain plEncryption) +target_link_libraries(MaxMain plFile) +target_link_libraries(MaxMain plGImage) +target_link_libraries(MaxMain plGLight) +target_link_libraries(MaxMain plInputCore) +target_link_libraries(MaxMain plInterp) +target_link_libraries(MaxMain plIntersect) +target_link_libraries(MaxMain plJPEG) +target_link_libraries(MaxMain plMath) +target_link_libraries(MaxMain plMessage) +target_link_libraries(MaxMain plModifier) +target_link_libraries(MaxMain plNetClient) +target_link_libraries(MaxMain plNetClientComm) +target_link_libraries(MaxMain plNetClientRecorder) +target_link_libraries(MaxMain plNetCommon) +target_link_libraries(MaxMain plNetGameLib) +target_link_libraries(MaxMain plNetMessage) +target_link_libraries(MaxMain plNetTransport) +target_link_libraries(MaxMain plParticleSystem) +target_link_libraries(MaxMain plPhysical) +target_link_libraries(MaxMain plPhysX) +target_link_libraries(MaxMain plPipeline) +target_link_libraries(MaxMain plProgressMgr) +target_link_libraries(MaxMain plResMgr) +target_link_libraries(MaxMain plScene) +target_link_libraries(MaxMain plSDL) +target_link_libraries(MaxMain plSockets) +target_link_libraries(MaxMain plStatGather) +target_link_libraries(MaxMain plStatusLog) +target_link_libraries(MaxMain plStreamLogger) +target_link_libraries(MaxMain plSurface) +target_link_libraries(MaxMain plTransform) +target_link_libraries(MaxMain plUnifiedTime) +target_link_libraries(MaxMain plUUID) +target_link_libraries(MaxMain plVault) +target_link_libraries(MaxMain pnAddrInfo) +target_link_libraries(MaxMain pnAsyncCore) +target_link_libraries(MaxMain pnAsyncCoreExe) +target_link_libraries(MaxMain pnCsrNet) +target_link_libraries(MaxMain pnDispatch) +target_link_libraries(MaxMain pnFactory) +target_link_libraries(MaxMain pnGameMgr) +target_link_libraries(MaxMain pnIni) +target_link_libraries(MaxMain pnIniExe) +target_link_libraries(MaxMain pnInputCore) +target_link_libraries(MaxMain pnKeyedObject) +target_link_libraries(MaxMain pnMessage) +target_link_libraries(MaxMain pnModifier) +target_link_libraries(MaxMain pnNetBase) +target_link_libraries(MaxMain pnNetCli) +target_link_libraries(MaxMain pnNetCommon) +target_link_libraries(MaxMain pnNucleusInc) +target_link_libraries(MaxMain pnProduct) +target_link_libraries(MaxMain pnSceneObject) +target_link_libraries(MaxMain pnSimpleNet) +target_link_libraries(MaxMain pnTimer) +target_link_libraries(MaxMain pnUtils) +target_link_libraries(MaxMain pnUtilsExe) + +if (WIN32) + target_link_libraries(MaxMain Rpcrt4) + target_link_libraries(MaxMain Ws2_32) +endif(WIN32) + +source_group("Header Files" FILES ${MaxMain_HEADERS}) +source_group("Resource Files" FILES ${MaxMain_RESOURCES}) +source_group("Source Files" FILES ${MaxMain_SOURCES}) diff --git a/Sources/Tools/MaxMain/GlobalUtility.cpp b/Sources/Tools/MaxMain/GlobalUtility.cpp index 354f86c7..9755ee67 100644 --- a/Sources/Tools/MaxMain/GlobalUtility.cpp +++ b/Sources/Tools/MaxMain/GlobalUtility.cpp @@ -28,18 +28,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plMaxNode.h" -#include "../MaxSceneViewer/SceneSync.h" +#include "MaxSceneViewer/SceneSync.h" -#include "../MaxComponent/ComponentDummies.h" +#include "MaxComponent/ComponentDummies.h" #include "plActionTableMgr.h" #include "plMaxMenu.h" -#include "../MaxComponent/plComponentBase.h" -#include "../MaxSceneViewer/plMaxFileData.h" -#include "../pfPython/cyPythonInterface.h" -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxComponent/plComponentBase.h" +#include "MaxSceneViewer/plMaxFileData.h" +#include "pfPython/cyPythonInterface.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #include "plMaxCFGFile.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" extern plActionTableMgr theActionTableMgr; extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxMain/indexes.cpp b/Sources/Tools/MaxMain/indexes.cpp index 4ffdd033..c93aa124 100644 --- a/Sources/Tools/MaxMain/indexes.cpp +++ b/Sources/Tools/MaxMain/indexes.cpp @@ -31,16 +31,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAllCreatables.h" //#include "pfAllCreatables.h" -#include "../pfCharacter/pfCharacterCreatable.h" -#include "../pfCamera/pfCameraCreatable.h" -#include "../pfAnimation/pfAnimationCreatable.h" -#include "../pfConditional/plConditionalObjectCreatable.h" -//#include "../pfConsole/pfConsoleCreatable.h" -#include "../pfSurface/pfSurfaceCreatable.h" -#include "../pfMessage/pfMessageCreatable.h" -#include "../pfAudio/pfAudioCreatable.h" -#include "../pfPython/pfPythonCreatable.h" -#include "../pfGameGUIMgr/pfGameGUIMgrCreatable.h" -#include "../pfCCR/plCCRCreatable.h" -#include "../pfJournalBook/pfJournalBookCreatable.h" -#include "../pfGameMgr/pfGameMgrCreatables.h" +#include "pfCharacter/pfCharacterCreatable.h" +#include "pfCamera/pfCameraCreatable.h" +#include "pfAnimation/pfAnimationCreatable.h" +#include "pfConditional/plConditionalObjectCreatable.h" +//#include "pfConsole/pfConsoleCreatable.h" +#include "pfSurface/pfSurfaceCreatable.h" +#include "pfMessage/pfMessageCreatable.h" +#include "pfAudio/pfAudioCreatable.h" +#include "pfPython/pfPythonCreatable.h" +#include "pfGameGUIMgr/pfGameGUIMgrCreatable.h" +#include "pfCCR/plCCRCreatable.h" +#include "pfJournalBook/pfJournalBookCreatable.h" +#include "pfGameMgr/pfGameMgrCreatables.h" diff --git a/Sources/Tools/MaxMain/main.cpp b/Sources/Tools/MaxMain/main.cpp index 32c325bc..1fbb1bd0 100644 --- a/Sources/Tools/MaxMain/main.cpp +++ b/Sources/Tools/MaxMain/main.cpp @@ -31,10 +31,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../MaxExport/SimpleExport.h" +#include "MaxExport/SimpleExport.h" -#include "../MaxComponent/plComponentMgr.h" -#include "../MaxPlasmaMtls/plMtlImport.h" +#include "MaxComponent/plComponentMgr.h" +#include "MaxPlasmaMtls/plMtlImport.h" extern ClassDesc* GetGUPDesc(); extern ClassDesc* GetComponentUtilDesc(); extern ClassDesc* GetComponentMgrDesc(); @@ -116,10 +116,10 @@ __declspec(dllexport) ULONG LibVersion() #include "plPythonMgr.h" #include "plPluginResManager.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" #include "plMaxCFGFile.h" #include -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" // // DLLMAIN @@ -210,7 +210,7 @@ public: ReferenceTarget *Clone(RemapDir &remap = NoRemap()); virtual bool CheckCopyAttribTo(ICustAttribContainer *to) { return true; } - TCHAR* GetName() { return (TCHAR*)fClassDesc->ClassName(); } + const char* GetName() { return (TCHAR*)fClassDesc->ClassName(); } void DeleteThis() { delete this; } }; diff --git a/Sources/Tools/MaxMain/plAgeDescInterface.cpp b/Sources/Tools/MaxMain/plAgeDescInterface.cpp index a04d4578..6aa4a755 100644 --- a/Sources/Tools/MaxMain/plAgeDescInterface.cpp +++ b/Sources/Tools/MaxMain/plAgeDescInterface.cpp @@ -27,8 +27,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeDescInterface.h" #include "max.h" #include "resource.h" -#include "../plFile/hsFiles.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plFile/hsFiles.h" +#include "plAgeDescription/plAgeDescription.h" #include "plMaxCFGFile.h" #include "hsStream.h" #include "hsUtils.h" diff --git a/Sources/Tools/MaxMain/plCommonObjLib.cpp b/Sources/Tools/MaxMain/plCommonObjLib.cpp index ed50ffbb..6a9c0bd5 100644 --- a/Sources/Tools/MaxMain/plCommonObjLib.cpp +++ b/Sources/Tools/MaxMain/plCommonObjLib.cpp @@ -34,8 +34,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsTypes.h" #include "plCommonObjLib.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" #include "plPluginResManager.h" diff --git a/Sources/Tools/MaxMain/plComponentDlg.cpp b/Sources/Tools/MaxMain/plComponentDlg.cpp index 6ff09a3f..d86444af 100644 --- a/Sources/Tools/MaxMain/plComponentDlg.cpp +++ b/Sources/Tools/MaxMain/plComponentDlg.cpp @@ -28,9 +28,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamb2.h" #include "plComponentDlg.h" -#include "../MaxComponent/plComponentBase.h" -#include "../MaxComponent/plComponentMgr.h" -#include "../MaxComponent/plComponentReg.h" +#include "MaxComponent/plComponentBase.h" +#include "MaxComponent/plComponentMgr.h" +#include "MaxComponent/plComponentReg.h" #include "resource.h" #include "plMaxNode.h" #include "plComponentPanel.h" diff --git a/Sources/Tools/MaxMain/plComponentPanel.cpp b/Sources/Tools/MaxMain/plComponentPanel.cpp index 5d973427..ba17b881 100644 --- a/Sources/Tools/MaxMain/plComponentPanel.cpp +++ b/Sources/Tools/MaxMain/plComponentPanel.cpp @@ -28,8 +28,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plMaxNode.h" -#include "../MaxComponent/plComponent.h" -#include "../MaxComponent/plComponentMgr.h" +#include "MaxComponent/plComponent.h" +#include "MaxComponent/plComponentMgr.h" #include "plComponentDlg.h" #include "plMaxAccelerators.h" diff --git a/Sources/Tools/MaxMain/plGetLocationDlg.cpp b/Sources/Tools/MaxMain/plGetLocationDlg.cpp index d835a9aa..926b378a 100644 --- a/Sources/Tools/MaxMain/plGetLocationDlg.cpp +++ b/Sources/Tools/MaxMain/plGetLocationDlg.cpp @@ -26,10 +26,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plGetLocationDlg.h" #include "plMaxNode.h" -#include "../MaxComponent/plMiscComponents.h" +#include "MaxComponent/plMiscComponents.h" #include "resource.h" -#include "../MaxExport/plErrorMsg.h" -#include "../MaxComponent/plComponent.h" +#include "MaxExport/plErrorMsg.h" +#include "MaxComponent/plComponent.h" #include "hsUtils.h" plGetLocationDlg::plGetLocationDlg() : fNode(nil), fErrMsg(nil), fDefaultLocation(nil) diff --git a/Sources/Tools/MaxMain/plMaxCFGFile.cpp b/Sources/Tools/MaxMain/plMaxCFGFile.cpp index 405b27e2..4be3d92d 100644 --- a/Sources/Tools/MaxMain/plMaxCFGFile.cpp +++ b/Sources/Tools/MaxMain/plMaxCFGFile.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMaxCFGFile.h" #include "max.h" #include "hsTypes.h" -#include "../plFile/plBrowseFolder.h" +#include "plFile/plBrowseFolder.h" const char *plMaxConfig::GetPluginIni() { diff --git a/Sources/Tools/MaxMain/plMaxMenu.cpp b/Sources/Tools/MaxMain/plMaxMenu.cpp index e39a2ece..7076dbb1 100644 --- a/Sources/Tools/MaxMain/plMaxMenu.cpp +++ b/Sources/Tools/MaxMain/plMaxMenu.cpp @@ -35,11 +35,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMaxCFGFile.h" #include "plResCollector.h" #include "plAgeDescInterface.h" -#include "../MaxSceneViewer/SceneViewer.h" +#include "MaxSceneViewer/SceneViewer.h" #include "plNodeLock.h" #include "plResetXform.h" #include "plTextureSearch.h" -#include "../MaxExport/plExportDlg.h" +#include "MaxExport/plExportDlg.h" // ************************* action table // diff --git a/Sources/Tools/MaxMain/plMaxNode.cpp b/Sources/Tools/MaxMain/plMaxNode.cpp index 064d5e08..b817da24 100644 --- a/Sources/Tools/MaxMain/plMaxNode.cpp +++ b/Sources/Tools/MaxMain/plMaxNode.cpp @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MNMath.h" #include "plMaxNode.h" -//#include "../MaxComponent/resource.h" +//#include "MaxComponent/resource.h" #include "GlobalUtility.h" #include "plgDispatch.h" @@ -39,91 +39,91 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMaxNodeData.h" #include "hsUtils.h" -#include "../MaxConvert/plConvert.h" +#include "MaxConvert/plConvert.h" #include "hsTemplates.h" #include "hsStringTokenizer.h" -#include "../MaxConvert/hsConverterUtils.h" -#include "../MaxConvert/hsControlConverter.h" -#include "../MaxConvert/plMeshConverter.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../MaxConvert/plLayerConverter.h" -#include "../MaxConvert/UserPropMgr.h" -#include "../MaxExport/plErrorMsg.h" -#include "../MaxConvert/hsVertexShader.h" -#include "../MaxConvert/plLightMapGen.h" +#include "MaxConvert/hsConverterUtils.h" +#include "MaxConvert/hsControlConverter.h" +#include "MaxConvert/plMeshConverter.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "MaxConvert/plLayerConverter.h" +#include "MaxConvert/UserPropMgr.h" +#include "MaxExport/plErrorMsg.h" +#include "MaxConvert/hsVertexShader.h" +#include "MaxConvert/plLightMapGen.h" #include "plMaxMeshExtractor.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" - -#include "../pnKeyedObject/plKey.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../plScene/plSceneNode.h" -#include "../plPhysX/plPXPhysical.h" -#include "../plDrawable/plInstanceDrawInterface.h" -#include "../plDrawable/plSharedMesh.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pfAnimation/plFilterCoordInterface.h" -#include "../plParticleSystem/plBoundInterface.h" -#include "../plPhysical/plPickingDetector.h" -#include "../plModifier/plLogicModifier.h" -#include "../plModifier/plResponderModifier.h" -#include "../plModifier/plInterfaceInfoModifier.h" -#include "../pfAnimation/plLightModifier.h" -#include "../pfCharacter/plPlayerModifier.h" -#include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGAnim.h" -#include "../plAvatar/plPointChannel.h" -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plMessage/plReplaceGeometryMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plModifier/plSpawnModifier.h" -#include "../plInterp/plController.h" -#include "../plInterp/hsInterp.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pfAnimation/plViewFaceModifier.h" // mf horse temp hack testing to be thrown away - -#include "../plScene/plOccluder.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" + +#include "pnKeyedObject/plKey.h" + +#include "pnSceneObject/plSceneObject.h" +#include "plScene/plSceneNode.h" +#include "plPhysX/plPXPhysical.h" +#include "plDrawable/plInstanceDrawInterface.h" +#include "plDrawable/plSharedMesh.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pfAnimation/plFilterCoordInterface.h" +#include "plParticleSystem/plBoundInterface.h" +#include "plPhysical/plPickingDetector.h" +#include "plModifier/plLogicModifier.h" +#include "plModifier/plResponderModifier.h" +#include "plModifier/plInterfaceInfoModifier.h" +#include "pfAnimation/plLightModifier.h" +#include "pfCharacter/plPlayerModifier.h" +#include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGAnim.h" +#include "plAvatar/plPointChannel.h" +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGMasterMod.h" +#include "plMessage/plReplaceGeometryMsg.h" +#include "plGImage/plMipmap.h" +#include "plModifier/plSpawnModifier.h" +#include "plInterp/plController.h" +#include "plInterp/hsInterp.h" +#include "pnMessage/plTimeMsg.h" +#include "pfAnimation/plViewFaceModifier.h" // mf horse temp hack testing to be thrown away + +#include "plScene/plOccluder.h" #include "hsFastMath.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plPipeline/plFogEnvironment.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plGeometrySpan.h" +#include "plPipeline/plFogEnvironment.h" -#include "../plGLight/plLightInfo.h" -#include "../plGLight/plLightKonstants.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" +#include "plGLight/plLightInfo.h" +#include "plGLight/plLightKonstants.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plIntRefMsg.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxExport/plExportProgressBar.h" -#include "../MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "../MaxComponent/plComponentTools.h" -#include "../MaxComponent/plComponent.h" -#include "../MaxComponent/plComponentExt.h" -#include "../MaxComponent/plFlexibilityComponent.h" -#include "../MaxComponent/plLightMapComponent.h" -#include "../MaxComponent/plXImposter.h" -#include "../MaxComponent/plMiscComponents.h" +#include "MaxComponent/plComponentTools.h" +#include "MaxComponent/plComponent.h" +#include "MaxComponent/plComponentExt.h" +#include "MaxComponent/plFlexibilityComponent.h" +#include "MaxComponent/plLightMapComponent.h" +#include "MaxComponent/plXImposter.h" +#include "MaxComponent/plMiscComponents.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticleEffect.h" -#include "../plParticleSystem/plParticleGenerator.h" -#include "../plParticleSystem/plConvexVolume.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticleEffect.h" +#include "plParticleSystem/plParticleGenerator.h" +#include "plParticleSystem/plConvexVolume.h" -#include "../MaxPlasmaLights/plRealTimeLightBase.h" -#include "../MaxPlasmaLights/plRTProjDirLight.h" +#include "MaxPlasmaLights/plRealTimeLightBase.h" +#include "MaxPlasmaLights/plRTProjDirLight.h" extern UserPropMgr gUserPropMgr; @@ -148,7 +148,7 @@ int GetMatAnimModKey(Mtl* mtl, plMaxNodeBase* node, const char *segName, hsTArra // In plAudioComponents int GetSoundNameAndIdx(plComponentBase *comp, plMaxNodeBase *node, const char*& name); -#include "../MaxComponent/plAnimComponent.h" +#include "MaxComponent/plAnimComponent.h" static const char *GetAnimCompAnimName(plComponentBase *comp) { @@ -411,11 +411,11 @@ hsBool plMaxNode::ClearMaxNodeData(plErrorMsg *pErrMsg, plConvertSettings *setti // // Helper for setting synchedObject options, until we have a GUI // -#include "../plResMgr/plKeyFinder.h" +#include "plResMgr/plKeyFinder.h" #include "plMaxCFGFile.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plResMgr/plPageInfo.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plResMgr/plPageInfo.h" +#include "pnNetCommon/plSDLTypes.h" void plMaxNode::CheckSynchOptions(plSynchedObject* so) { @@ -601,8 +601,8 @@ hsBool plMaxNode::IFindBones(plErrorMsg *pErrMsg, plConvertSettings *settings) #include "plMaxMeshExtractor.h" #include "plPhysXCooking.h" -#include "../plPhysX/plPXStream.h" -#include "../plPhysX/plSimulationMgr.h" +#include "plPhysX/plPXStream.h" +#include "plPhysX/plSimulationMgr.h" #include "hsSTLStream.h" hsBool plMaxNode::MakePhysical(plErrorMsg *pErrMsg, plConvertSettings *settings) diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.cpp b/Sources/Tools/MaxMain/plMaxNodeBase.cpp index 7405f5b2..0bd5de63 100644 --- a/Sources/Tools/MaxMain/plMaxNodeBase.cpp +++ b/Sources/Tools/MaxMain/plMaxNodeBase.cpp @@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "dummy.h" //To support the new Plasma Light Objs, the classes are included below -#include "../MaxPlasmaLights/plRealTimeLightBase.h" +#include "MaxPlasmaLights/plRealTimeLightBase.h" #include @@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "GlobalUtility.h" // Only needed for PLASMA_MAX_CLASSID, fix? -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" -#include "../pnModifier/plModifier.h" +#include "pnModifier/plModifier.h" -#include "../MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "../MaxComponent/plComponentBase.h" +#include "MaxComponent/plComponentBase.h" CoreExport void *__cdecl MAX_new(size_t size); CoreExport void __cdecl MAX_delete(void* mem); diff --git a/Sources/Tools/MaxMain/plMaxUtils.cpp b/Sources/Tools/MaxMain/plMaxUtils.cpp index 78fa9614..b8acdc85 100644 --- a/Sources/Tools/MaxMain/plMaxUtils.cpp +++ b/Sources/Tools/MaxMain/plMaxUtils.cpp @@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "hsResMgr.h" -#include "../plResMgr/plPageInfo.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnFactory/plFactory.h" +#include "plResMgr/plPageInfo.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnFactory/plFactory.h" class MaxUtilsClassDesc : public ClassDesc { @@ -97,7 +97,7 @@ BOOL plMaxUtils::DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) } #include "plMtlCollector.h" -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #include "../../AssetMan/PublicInterface/AssManTypes.h" int ClearTextureIds() diff --git a/Sources/Tools/MaxMain/plMtlCollector.cpp b/Sources/Tools/MaxMain/plMtlCollector.cpp index 178a9c9b..5cce4b1f 100644 --- a/Sources/Tools/MaxMain/plMtlCollector.cpp +++ b/Sources/Tools/MaxMain/plMtlCollector.cpp @@ -26,20 +26,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plMtlCollector.h" -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" -#include "../MaxPlasmaMtls/Materials/plCompositeMtl.h" -#include "../MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "../MaxPlasmaMtls/Materials/plMultipassMtl.h" -#include "../MaxPlasmaMtls/Materials/plParticleMtl.h" -#include "../MaxPlasmaMtls/Materials/plPassMtl.h" -#include "../MaxPlasmaMtls/Materials/plClothingMtl.h" +#include "MaxPlasmaMtls/Materials/plCompositeMtl.h" +#include "MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxPlasmaMtls/Materials/plMultipassMtl.h" +#include "MaxPlasmaMtls/Materials/plParticleMtl.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" +#include "MaxPlasmaMtls/Materials/plClothingMtl.h" -#include "../MaxComponent/plGUIComponents.h" -#include "../MaxComponent/pfGUISkinComp.h" -#include "../MaxComponent/plMiscComponents.h" +#include "MaxComponent/plGUIComponents.h" +#include "MaxComponent/pfGUISkinComp.h" +#include "MaxComponent/plMiscComponents.h" -#include "../MaxMain/plMaxNodeBase.h" +#include "MaxMain/plMaxNodeBase.h" static bool IsPlasmaMtl(Mtl *mtl) { @@ -159,7 +159,7 @@ static void GetTexmapPBs(Texmap* tex, PBSet& pbs) } } -#include "../MaxPlasmaLights/plRealTimeLightBase.h" +#include "MaxPlasmaLights/plRealTimeLightBase.h" static void GetNodeMtlsRecur(INode *node, MtlSet* mtls, TexSet* texmaps, UInt32 flags) { diff --git a/Sources/Tools/MaxMain/plPhysXCooking.cpp b/Sources/Tools/MaxMain/plPhysXCooking.cpp index 0859aeaf..6e561e7f 100644 --- a/Sources/Tools/MaxMain/plPhysXCooking.cpp +++ b/Sources/Tools/MaxMain/plPhysXCooking.cpp @@ -25,9 +25,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPhysXCooking.h" #include "hsGeometry3.h" -#include "../plPhysX/plSimulationMgr.h" -#include "../plPhysX/plPXStream.h" -#include "../plPhysX/plPXConvert.h" +#include "plPhysX/plSimulationMgr.h" +#include "plPhysX/plPXStream.h" +#include "plPhysX/plPXConvert.h" #include "hsSTLStream.h" #include "Nx.h" diff --git a/Sources/Tools/MaxMain/plPhysicalProps.cpp b/Sources/Tools/MaxMain/plPhysicalProps.cpp index da44fc1c..df756d57 100644 --- a/Sources/Tools/MaxMain/plPhysicalProps.cpp +++ b/Sources/Tools/MaxMain/plPhysicalProps.cpp @@ -25,12 +25,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "plPhysicalProps.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" // For plBoundsType -#include "../pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plSimulationInterface.h" #include "plMaxNode.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxExport/plErrorMsg.h" /** These enums are used to indicate which parameters are ignorable and can be overridden. diff --git a/Sources/Tools/MaxMain/plPluginResManager.cpp b/Sources/Tools/MaxMain/plPluginResManager.cpp index da8830cb..79336dda 100644 --- a/Sources/Tools/MaxMain/plPluginResManager.cpp +++ b/Sources/Tools/MaxMain/plPluginResManager.cpp @@ -27,19 +27,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPluginResManager.h" #include "hsTypes.h" #include "hsTemplates.h" -#include "../plResMgr/plRegistryNode.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plVersion.h" -#include "../plResMgr/plResMgrSettings.h" -#include "../plScene/plSceneNode.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plResMgr/plRegistryNode.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plVersion.h" +#include "plResMgr/plResMgrSettings.h" +#include "plScene/plSceneNode.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "plAgeDescription/plAgeDescription.h" #include "plgDispatch.h" // For our common object libs #include "plCommonObjLib.h" -#include "../MaxComponent/plMiscComponents.h" +#include "MaxComponent/plMiscComponents.h" plKey plPluginResManager::NameToLoc(const char* age, const char* page, Int32 sequenceNumber, hsBool itinerant) { diff --git a/Sources/Tools/MaxMain/plPythonMgr.cpp b/Sources/Tools/MaxMain/plPythonMgr.cpp index e42404a7..a1b4998e 100644 --- a/Sources/Tools/MaxMain/plPythonMgr.cpp +++ b/Sources/Tools/MaxMain/plPythonMgr.cpp @@ -26,13 +26,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plPythonMgr.h" -#include "../MaxComponent/plAutoUIBlock.h" +#include "MaxComponent/plAutoUIBlock.h" //#include "Python.h" #include "plMaxCFGFile.h" -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" #include "plgDispatch.h" -#include "../pfPython/cyPythonInterface.h" +#include "pfPython/cyPythonInterface.h" #include "hsUtils.h" plPythonMgr::plPythonMgr() diff --git a/Sources/Tools/MaxMain/plResCollector.cpp b/Sources/Tools/MaxMain/plResCollector.cpp index 2e78806f..64b5529e 100644 --- a/Sources/Tools/MaxMain/plResCollector.cpp +++ b/Sources/Tools/MaxMain/plResCollector.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plResCollector.h" #include "plMtlCollector.h" #include "max.h" -#include "../MaxExport/plExportProgressBar.h" +#include "MaxExport/plExportProgressBar.h" void plResCollector::Collect() { diff --git a/Sources/Tools/MaxMain/plResetXform.cpp b/Sources/Tools/MaxMain/plResetXform.cpp index f3585130..26c6d763 100644 --- a/Sources/Tools/MaxMain/plResetXform.cpp +++ b/Sources/Tools/MaxMain/plResetXform.cpp @@ -29,8 +29,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plResetXform.h" -#include "../MaxMain/plMaxNode.h" -#include "../MaxComponent/plComponent.h" +#include "MaxMain/plMaxNode.h" +#include "MaxComponent/plComponent.h" void plResetXform::ResetSelected() const diff --git a/Sources/Tools/MaxMain/plSaveSelected.cpp b/Sources/Tools/MaxMain/plSaveSelected.cpp index 831f64b1..9e84873e 100644 --- a/Sources/Tools/MaxMain/plSaveSelected.cpp +++ b/Sources/Tools/MaxMain/plSaveSelected.cpp @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "max.h" #include "notify.h" -#include "../MaxComponent/plComponent.h" +#include "MaxComponent/plComponent.h" #include #include "plMaxNode.h" diff --git a/Sources/Tools/MaxMain/plTextureExportLog.cpp b/Sources/Tools/MaxMain/plTextureExportLog.cpp index e03fb985..e582c73b 100644 --- a/Sources/Tools/MaxMain/plTextureExportLog.cpp +++ b/Sources/Tools/MaxMain/plTextureExportLog.cpp @@ -36,12 +36,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsWindows.h" #include "plTextureExportLog.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plPipeline/plRenderTarget.h" -#include "../plPipeline/plCubicRenderTarget.h" -#include "../pnKeyedObject/plKey.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plPipeline/plRenderTarget.h" +#include "plPipeline/plCubicRenderTarget.h" +#include "pnKeyedObject/plKey.h" #include "hsUtils.h" #include "hsStream.h" diff --git a/Sources/Tools/MaxMain/plTextureSearch.cpp b/Sources/Tools/MaxMain/plTextureSearch.cpp index 2a944df8..abb07a20 100644 --- a/Sources/Tools/MaxMain/plTextureSearch.cpp +++ b/Sources/Tools/MaxMain/plTextureSearch.cpp @@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMtlCollector.h" #include "plMaxAccelerators.h" -#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #include "../../AssetMan/PublicInterface/MaxAssInterface.h" // Not a class member so we don't have to make everyone who uses this know about AssetMan diff --git a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt new file mode 100644 index 00000000..b464ec83 --- /dev/null +++ b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt @@ -0,0 +1,134 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) + +set(MaxPlasmaLights_HEADERS + plRealTimeLightBase.h + plRealTimeLights.h + plRealTimeLightsPBDec.h + plRTLightBaseAnimDlgProc.h + plRTLightBaseAnimPBDec.h + plRTObjLightDesc.h + plRTProjDirLight.h + plRTProjDirLightClassDesc.h + plRTProjDirLightPBDec.h + prim.h + resource.h + target.h +) + +set(MaxPlasmaLights_SOURCES + DLLEntry.cpp + plRealTimeLightBase.cpp + plRealTimeLights.cpp + plRTProjDirLight.cpp +) + +add_library(MaxPlasmaLights SHARED ${MaxPlasmaLights_HEADERS} ${MaxPlasmaLights_SOURCES}) +set_target_properties(MaxPlasmaLights PROPERTIES SUFFIX ".dlo") + + +target_link_libraries(MaxPlasmaLights MaxComponent) +target_link_libraries(MaxPlasmaLights ${3dsm_LIBRARIES}) + +# Carbon copy from plClient +# TODO: Maybe see if some of these can be removed? +target_link_libraries(MaxPlasmaLights CoreLib) +target_link_libraries(MaxPlasmaLights CoreLibExe) +target_link_libraries(MaxPlasmaLights pfAnimation) +target_link_libraries(MaxPlasmaLights pfAudio) +target_link_libraries(MaxPlasmaLights pfCamera) +target_link_libraries(MaxPlasmaLights pfCCR) +target_link_libraries(MaxPlasmaLights pfCharacter) +target_link_libraries(MaxPlasmaLights pfConditional) +target_link_libraries(MaxPlasmaLights pfConsole) +target_link_libraries(MaxPlasmaLights pfCsrSrv) +target_link_libraries(MaxPlasmaLights pfGameGUIMgr) +target_link_libraries(MaxPlasmaLights pfGameMgr) +target_link_libraries(MaxPlasmaLights pfGameScoreMgr) +target_link_libraries(MaxPlasmaLights pfJournalBook) +target_link_libraries(MaxPlasmaLights pfLocalizationMgr) +target_link_libraries(MaxPlasmaLights pfMessage) +target_link_libraries(MaxPlasmaLights pfPython) +target_link_libraries(MaxPlasmaLights pfSecurePreloader) +target_link_libraries(MaxPlasmaLights pfStackTrace) +target_link_libraries(MaxPlasmaLights pfSurface) +target_link_libraries(MaxPlasmaLights plAgeDescription) +target_link_libraries(MaxPlasmaLights plAgeLoader) +target_link_libraries(MaxPlasmaLights plAudible) +target_link_libraries(MaxPlasmaLights plAudio) +target_link_libraries(MaxPlasmaLights plAudioCore) +target_link_libraries(MaxPlasmaLights plAvatar) +target_link_libraries(MaxPlasmaLights plCompression) +target_link_libraries(MaxPlasmaLights plContainer) +target_link_libraries(MaxPlasmaLights plDrawable) +target_link_libraries(MaxPlasmaLights plEncryption) +target_link_libraries(MaxPlasmaLights plFile) +target_link_libraries(MaxPlasmaLights plGImage) +target_link_libraries(MaxPlasmaLights plGLight) +target_link_libraries(MaxPlasmaLights plInputCore) +target_link_libraries(MaxPlasmaLights plInterp) +target_link_libraries(MaxPlasmaLights plIntersect) +target_link_libraries(MaxPlasmaLights plJPEG) +target_link_libraries(MaxPlasmaLights plMath) +target_link_libraries(MaxPlasmaLights plMessage) +target_link_libraries(MaxPlasmaLights plModifier) +target_link_libraries(MaxPlasmaLights plNetClient) +target_link_libraries(MaxPlasmaLights plNetClientComm) +target_link_libraries(MaxPlasmaLights plNetClientRecorder) +target_link_libraries(MaxPlasmaLights plNetCommon) +target_link_libraries(MaxPlasmaLights plNetGameLib) +target_link_libraries(MaxPlasmaLights plNetMessage) +target_link_libraries(MaxPlasmaLights plNetTransport) +target_link_libraries(MaxPlasmaLights plParticleSystem) +target_link_libraries(MaxPlasmaLights plPhysical) +target_link_libraries(MaxPlasmaLights plPhysX) +target_link_libraries(MaxPlasmaLights plPipeline) +target_link_libraries(MaxPlasmaLights plProgressMgr) +target_link_libraries(MaxPlasmaLights plResMgr) +target_link_libraries(MaxPlasmaLights plScene) +target_link_libraries(MaxPlasmaLights plSDL) +target_link_libraries(MaxPlasmaLights plSockets) +target_link_libraries(MaxPlasmaLights plStatGather) +target_link_libraries(MaxPlasmaLights plStatusLog) +target_link_libraries(MaxPlasmaLights plStreamLogger) +target_link_libraries(MaxPlasmaLights plSurface) +target_link_libraries(MaxPlasmaLights plTransform) +target_link_libraries(MaxPlasmaLights plUnifiedTime) +target_link_libraries(MaxPlasmaLights plUUID) +target_link_libraries(MaxPlasmaLights plVault) +target_link_libraries(MaxPlasmaLights pnAddrInfo) +target_link_libraries(MaxPlasmaLights pnAsyncCore) +target_link_libraries(MaxPlasmaLights pnAsyncCoreExe) +target_link_libraries(MaxPlasmaLights pnCsrNet) +target_link_libraries(MaxPlasmaLights pnDispatch) +target_link_libraries(MaxPlasmaLights pnFactory) +target_link_libraries(MaxPlasmaLights pnGameMgr) +target_link_libraries(MaxPlasmaLights pnIni) +target_link_libraries(MaxPlasmaLights pnIniExe) +target_link_libraries(MaxPlasmaLights pnInputCore) +target_link_libraries(MaxPlasmaLights pnKeyedObject) +target_link_libraries(MaxPlasmaLights pnMessage) +target_link_libraries(MaxPlasmaLights pnModifier) +target_link_libraries(MaxPlasmaLights pnNetBase) +target_link_libraries(MaxPlasmaLights pnNetCli) +target_link_libraries(MaxPlasmaLights pnNetCommon) +target_link_libraries(MaxPlasmaLights pnNucleusInc) +target_link_libraries(MaxPlasmaLights pnProduct) +target_link_libraries(MaxPlasmaLights pnSceneObject) +target_link_libraries(MaxPlasmaLights pnSimpleNet) +target_link_libraries(MaxPlasmaLights pnTimer) +target_link_libraries(MaxPlasmaLights pnUtils) +target_link_libraries(MaxPlasmaLights pnUtilsExe) + +if (WIN32) + target_link_libraries(MaxPlasmaLights Rpcrt4) + target_link_libraries(MaxPlasmaLights Ws2_32) +endif(WIN32) + +source_group("Header Files" FILES ${MaxPlasmaLights_HEADERS}) +source_group("Source Files" FILES ${MaxPlasmaLights_SOURCES}) diff --git a/Sources/Tools/MaxPlasmaLights/DLLEntry.cpp b/Sources/Tools/MaxPlasmaLights/DLLEntry.cpp index cb7ef610..69eb7437 100644 --- a/Sources/Tools/MaxPlasmaLights/DLLEntry.cpp +++ b/Sources/Tools/MaxPlasmaLights/DLLEntry.cpp @@ -28,11 +28,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRealTimeLights.h" #include "plRTProjDirLightClassDesc.h" -#include "../pnMessage/pnMessageCreatable.h" -#include "../pnKeyedObject/pnKeyedObjectCreatable.h" -#include "../pnNetCommon/pnNetCommonCreatable.h" +#include "pnMessage/pnMessageCreatable.h" +#include "pnKeyedObject/pnKeyedObjectCreatable.h" +#include "pnNetCommon/pnNetCommonCreatable.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/plLayerInterface.h" REGISTER_NONCREATABLE( plLayerInterface ); diff --git a/Sources/Tools/MaxPlasmaLights/plRTLightBaseAnimDlgProc.h b/Sources/Tools/MaxPlasmaLights/plRTLightBaseAnimDlgProc.h index 9e851501..f645e7bf 100644 --- a/Sources/Tools/MaxPlasmaLights/plRTLightBaseAnimDlgProc.h +++ b/Sources/Tools/MaxPlasmaLights/plRTLightBaseAnimDlgProc.h @@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if 0//ndef _plRTLightBaseAnimDlgProc_h #define _plRTLightBaseAnimDlgProc_h -#include "../MaxComponent/plNotetrackDlg.h" +#include "plNotetrackDlg.h" /////////////////////////////////////////////////////////////////////////////// //// Dialog Proc for Animation Rollout //////////////////////////////////////// diff --git a/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp b/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp index afafd965..bfd58fe6 100644 --- a/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp +++ b/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp @@ -38,9 +38,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRTProjDirLight.h" #include "plRTProjDirLightClassDesc.h" #include "iparamm2.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" -#include "../MaxComponent/plMaxAnimUtils.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" +#include "MaxComponent/plMaxAnimUtils.h" #include "plRTObjLightDesc.h" #include "plRTLightBaseAnimDlgProc.h" diff --git a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp index 89b685fa..8d9e5a73 100644 --- a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp +++ b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "decomp.h" #include "hsv.h" #include "target.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" static int GetTargetPoint(TimeValue t, INode *inode, Point3& p) diff --git a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.h b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.h index ee93508a..2ef2a5d7 100644 --- a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.h +++ b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.h @@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Our generic headers #include "hsTypes.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" extern TCHAR *GetString(int id); diff --git a/Sources/Tools/MaxPlasmaLights/plRealTimeLights.cpp b/Sources/Tools/MaxPlasmaLights/plRealTimeLights.cpp index 4dfcbc75..66abd86f 100644 --- a/Sources/Tools/MaxPlasmaLights/plRealTimeLights.cpp +++ b/Sources/Tools/MaxPlasmaLights/plRealTimeLights.cpp @@ -37,11 +37,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plRealTimeLights.h" #include "iparamm2.h" -#include "../MaxPlasmaMtls/Layers/plLayerTex.h" -#include "../MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" -#include "../MaxComponent/plMaxAnimUtils.h" +#include "MaxPlasmaMtls/Layers/plLayerTex.h" +#include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" +#include "MaxComponent/plMaxAnimUtils.h" #include "plRTLightBaseAnimDlgProc.h" -#include "../plGLight/plLightKonstants.h" +#include "plGLight/plLightKonstants.h" void DummyLightCodeIncludeFunc() {} diff --git a/Sources/Tools/MaxPlasmaMtls/CMakeLists.txt b/Sources/Tools/MaxPlasmaMtls/CMakeLists.txt new file mode 100644 index 00000000..63fba4b6 --- /dev/null +++ b/Sources/Tools/MaxPlasmaMtls/CMakeLists.txt @@ -0,0 +1,147 @@ +include_directories("../") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/PubUtilLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories(${3dsm_INCLUDE_DIR}) + +if(Bink_SDK_AVAILABLE) + include_directories(${Bink_INCLUDE_DIR}) +endif() + +set(MaxPlasmaMtls_HEADERS + plBinkBitmap.h + plBMSampler.h + plDetailCurveCtrl.h + plMaterialRefMsg.h + plMtlImport.h + Shaders.h +) + +set(MaxPlasmaMtls_HEADERS_Layers + Layers/plAngleAttenLayer.h + Layers/plDynamicEnvLayer.h + Layers/plDynamicTextLayer.h + Layers/plLayerTex.h + Layers/plLayerTexBasicPB.h + Layers/plLayerTexBitmapPB.h + Layers/plMAXCameraLayer.h + Layers/plPlasmaMAXLayer.h + Layers/plStaticEnvLayer.h + Layers/plStaticEnvLayerBitmapPB.h +) + +set(MaxPlasmaMtls_HEADERS_Materials + Materials/plAnimStealthNode.h + Materials/plBumpMtl.h + Materials/plBumpMtlAnimPB.h + Materials/plBumpMtlAnimPBDec.h + Materials/plBumpMtlBasicPB.h + Materials/plBumpMtlBasicPBDec.h + Materials/plClothingMtl.h + Materials/plClothingMtlPBDec.h + Materials/plCompositeMtl.h + Materials/plCompositeMtlDlg.h + Materials/plCompositeMtlPB.h + Materials/plCompositeMtlPBDec.h + Materials/plDecalMtl.h + Materials/plDecalMtlAdvPB.h + Materials/plDecalMtlAdvPBDec.h + Materials/plDecalMtlAnimPB.h + Materials/plDecalMtlAnimPBDec.h + Materials/plDecalMtlBasicPB.h + Materials/plDecalMtlBasicPBDec.h + Materials/plDecalMtlLayersPB.h + Materials/plDecalMtlLayersPBDec.h + Materials/plMultipassMtl.h + Materials/plMultipassMtlDlg.h + Materials/plMultipassMtlPB.h + Materials/plNoteTrackWatcher.h + Materials/plParticleMtl.h + Materials/plParticleMtlPBDec.h + Materials/plPassAnimDlgProc.h + Materials/plPassBaseParamIDs.h + Materials/plPassMtl.h + Materials/plPassMtlAdvPB.h + Materials/plPassMtlAdvPBDec.h + Materials/plPassMtlAnimPB.h + Materials/plPassMtlAnimPBDec.h + Materials/plPassMtlBase.h + Materials/plPassMtlBasicPB.h + Materials/plPassMtlBasicPBDec.h + Materials/plPassMtlLayersPB.h + Materials/plPassMtlLayersPBDec.h +) + +set(MaxPlasmaMtls_RESOURCES + MaxPlasmaMtls.rc + resource.h + + res/detailBgnd8bit.bmp + res/dmtlbut.bmp + res/dmtlmsk.bmp +) + +set(MaxPlasmaMtls_SOURCES + plBinkBitmap.cpp + plBMSampler.cpp + plDetailCurveCtrl.cpp + plDrawCurve.cpp + plMtlImport.cpp + Shaders.cpp +) + +set(MaxPlasmaMtls_SOURCES_Layers + Layers/plAngleAttenLayer.cpp + Layers/plDynamicEnvLayer.cpp + Layers/plDynamicEnvLayerBitmapPB.cpp + Layers/plDynamicTextLayer.cpp + Layers/plDynamicTextLayerBitmapPB.cpp + Layers/plLayerTex.cpp + Layers/plLayerTexBasicPB.cpp + Layers/plLayerTexBitmapPB.cpp + Layers/plMAXCameraLayer.cpp + Layers/plPlasmaMAXLayer.cpp + Layers/plStaticEnvLayer.cpp + Layers/plStaticEnvLayerBitmapPB.cpp +) + +set(MaxPlasmaMtls_SOURCES_Materials + Materials/plAnimStealthConvert.cpp + Materials/plAnimStealthNode.cpp + Materials/plBumpMtl.cpp + Materials/plClothingMtl.cpp + Materials/plCompositeMtl.cpp + Materials/plCompositeMtlDlg.cpp + Materials/plDecalMtl.cpp + Materials/plMultipassMtl.cpp + Materials/plMultipassMtlDlg.cpp + Materials/plMultipassMtlPB.cpp + Materials/plNoteTrackWatcher.cpp + Materials/plParticleMtl.cpp + Materials/plPassAnimDlgProc.cpp + Materials/plPassMtl.cpp + Materials/plPassMtlBase.cpp +) + +add_library(MaxPlasmaMtls + STATIC + ${MaxPlasmaMtls_HEADERS} + ${MaxPlasmaMtls_HEADERS_Layers} + ${MaxPlasmaMtls_HEADERS_Materials} + ${MaxPlasmaMtls_RESOURCES} + ${MaxPlasmaMtls_SOURCES} + ${MaxPlasmaMtls_SOURCES_Layers} + ${MaxPlasmaMtls_SOURCES_Materials} +) + +source_group("Header Files" FILES ${MaxPlasmaMtls_HEADERS}) +source_group("Header Files\\Layers" FILES ${MaxPlasmaMtls_HEADERS_Layers}) +source_group("Header Files\\Materials" FILES ${MaxPlasmaMtls_HEADERS_Materials}) +source_group("Resource Files" FILES ${MaxPlasmaMtls_RESOURCES}) +source_group("Source Files" FILES ${MaxPlasmaMtls_SOURCES}) +source_group("Source Files\\Layers" FILES ${MaxPlasmaMtls_SOURCES_Layers}) +source_group("Source Files\\Materials" FILES ${MaxPlasmaMtls_SOURCES_Materials}) diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plAngleAttenLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plAngleAttenLayer.cpp index b7177995..02256dd2 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plAngleAttenLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plAngleAttenLayer.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" class plAngleAttenLayerClassDesc : public ClassDesc2 { diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.cpp index c5f2cc43..e438050c 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamb2.h" #include "iparamm2.h" #include "stdmat.h" -#include "resource.h" +#include "../resource.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" //// Externs ////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.h b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.h index 282d7c8b..4db993d5 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.h +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayer.h @@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "Max.h" #include "plPlasmaMAXLayer.h" +#include "../resource.h" class ClassDesc2; class IParamBlock2; diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayerBitmapPB.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayerBitmapPB.cpp index ed0f8096..e6b561e7 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayerBitmapPB.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicEnvLayerBitmapPB.cpp @@ -34,6 +34,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // /////////////////////////////////////////////////////////////////////////////// +#include "plDynamicEnvLayer.h" + /////////////////////////////////////////////////////////////////////////////// //// PickAnchorNode /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayer.cpp index 18b2c57c..cb1255d6 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayer.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" class plDynamicTextLayerClassDesc : public ClassDesc2 { diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayerBitmapPB.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayerBitmapPB.cpp index 95212f1a..4fefe691 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayerBitmapPB.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plDynamicTextLayerBitmapPB.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plLayerTex.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plLayerTex.cpp index 023b1fc6..c14277f4 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plLayerTex.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plLayerTex.cpp @@ -30,10 +30,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" +#include "../plBMSampler.h" #include "../resource.h" #include "plLayerTexBitmapPB.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxMain/plPlasmaRefMsgs.h" class plLayerTexClassDesc : public ClassDesc2 { diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plMAXCameraLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plMAXCameraLayer.cpp index 48af8c50..3c3fa1ae 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plMAXCameraLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plMAXCameraLayer.cpp @@ -31,8 +31,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" class plMAXCameraLayerClassDesc : public ClassDesc2 { diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plPlasmaMAXLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plPlasmaMAXLayer.cpp index 826d6dbc..ecce6ff9 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plPlasmaMAXLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plPlasmaMAXLayer.cpp @@ -44,13 +44,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "istdplug.h" #include "iparamb2.h" #include "iparamm2.h" -#include "resource.h" +#include "../resource.h" #include "../../AssetMan/PublicInterface/MaxAssInterface.h" #include "hsUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plRefMsg.h" -#include "../plSurface/plLayerInterface.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plRefMsg.h" +#include "plSurface/plLayerInterface.h" #include "hsResMgr.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Layers/plStaticEnvLayer.cpp b/Sources/Tools/MaxPlasmaMtls/Layers/plStaticEnvLayer.cpp index 694ed211..cec0c644 100644 --- a/Sources/Tools/MaxPlasmaMtls/Layers/plStaticEnvLayer.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Layers/plStaticEnvLayer.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "stdmat.h" -#include "plBMSampler.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" class plStaticEnvLayerClassDesc : public ClassDesc2 { diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthConvert.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthConvert.cpp index 0a99cce1..9f6900d1 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthConvert.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthConvert.cpp @@ -32,14 +32,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAnimStealthNode.h" #include "plPassMtlBase.h" -#include "resource.h" - -#include "../MaxMain/plMaxNode.h" -#include "../MaxComponent/plMaxAnimUtils.h" -#include "../MaxConvert/plConvert.h" -#include "../MaxConvert/hsMaterialConverter.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerAnimation.h" +#include "../resource.h" + +#include "MaxMain/plMaxNode.h" +#include "MaxComponent/plMaxAnimUtils.h" +#include "MaxConvert/plConvert.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerAnimation.h" #include "iparamm2.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp index 3ba9bbd4..841b765d 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp @@ -35,10 +35,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAnimStealthNode.h" #include "plPassMtlBase.h" -#include "resource.h" +#include "../resource.h" -#include "../MaxComponent/plMaxAnimUtils.h" -#include "../MaxComponent/plPickNodeBase.h" +#include "MaxComponent/plMaxAnimUtils.h" +#include "MaxComponent/plPickNodeBase.h" #include "iparamm2.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.h b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.h index 0c76f295..437b8f20 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.h @@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" -#include "../MaxComponent/plAnimObjInterface.h" -#include "../MaxComponent/plMaxAnimUtils.h" +#include "pnKeyedObject/plKey.h" +#include "MaxComponent/plAnimObjInterface.h" +#include "MaxComponent/plMaxAnimUtils.h" extern TCHAR *GetString(int id); extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plBumpMtl.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plBumpMtl.cpp index 36337f87..6e6d261b 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plBumpMtl.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plBumpMtl.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plBumpMtl.h" -#include "resource.h" +#include "../resource.h" //extern ClassDesc2* GetMaxLayerDesc(); #include "Shaders.h" @@ -33,9 +33,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" -#include "Layers/plLayerTex.h" -#include "Layers/plStaticEnvLayer.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../Layers/plLayerTex.h" +#include "../Layers/plStaticEnvLayer.h" +#include "MaxMain/plPlasmaRefMsgs.h" extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.cpp index 12140004..6423abe6 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.cpp @@ -25,17 +25,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsUtils.h" #include "plClothingMtl.h" -#include "resource.h" +#include "../resource.h" #include "Shaders.h" #include "iparamm2.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" #include "stdmat.h" -#include "Layers/plLayerTex.h" -#include "Layers/plLayerTexBitmapPB.h" -#include "../../Plasma/PubUtilLib/plAvatar/plClothingLayout.h" +#include "../Layers/plLayerTex.h" +#include "../Layers/plLayerTexBitmapPB.h" +#include "plAvatar/plClothingLayout.h" extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h index 543c3576..fd1410bc 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h @@ -121,12 +121,12 @@ public: int GetTilesetIndex() { return fBasicPB->GetInt(ParamID(kTileset)); } DllExport Texmap *GetTexmap(int index, int layer); Texmap *GetThumbnail() { return fBasicPB->GetTexmap(ParamID(kThumbnail)); } - char *GetDescription() { return fBasicPB->GetStr(ParamID(kDescription)); } - char *GetCustomText() { return fBasicPB->GetStr(ParamID(kCustomTextSpecs)); } + const char *GetDescription() { return fBasicPB->GetStr(ParamID(kDescription)); } + const char *GetCustomText() { return fBasicPB->GetStr(ParamID(kCustomTextSpecs)); } hsBool GetDefault() { return fBasicPB->GetInt(ParamID(kDefault)) != 0; } Color GetDefaultTint1() { return fBasicPB->GetColor(plClothingMtl::kDefaultTint1); } Color GetDefaultTint2() { return fBasicPB->GetColor(plClothingMtl::kDefaultTint2); } - char *GetForcedAccessoryName() { return fBasicPB->GetStr(ParamID(kForcedAcc)); } + const char *GetForcedAccessoryName() { return fBasicPB->GetStr(ParamID(kForcedAcc)); } plClothingMtl(BOOL loading); void DeleteThis() { delete this; } diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtl.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtl.cpp index 8463f19f..d4d271b8 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtl.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtl.cpp @@ -25,10 +25,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plDecalMtl.h" -#include "resource.h" +#include "../resource.h" //extern ClassDesc2* GetMaxLayerDesc(); #include "Shaders.h" -#include "../MaxComponent/plMaxAnimUtils.h" +#include "MaxComponent/plMaxAnimUtils.h" #include "plPassBaseParamIDs.h" #include "plDecalMtlBasicPB.h" @@ -36,9 +36,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" -#include "Layers/plLayerTex.h" -#include "Layers/plStaticEnvLayer.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "../Layers/plLayerTex.h" +#include "../Layers/plStaticEnvLayer.h" +#include "MaxMain/plPlasmaRefMsgs.h" extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlAnimPBDec.h b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlAnimPBDec.h index 89d6c688..0e84725c 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlAnimPBDec.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlAnimPBDec.h @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plDecalMtl.h" #include "plPassBaseParamIDs.h" -#include "resource.h" +#include "../resource.h" #include "iparamm2.h" #include "plPassAnimDlgProc.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlLayersPBDec.h b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlLayersPBDec.h index 56333486..4b6516c1 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlLayersPBDec.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plDecalMtlLayersPBDec.h @@ -25,11 +25,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plDecalMtl.h" #include "plDecalMtlLayersPB.h" -#include "resource.h" +#include "../resource.h" #include "iparamm2.h" -#include "Layers/plLayerTex.h" +#include "../Layers/plLayerTex.h" class DecalMtlLayersAccessor; extern DecalMtlLayersAccessor gLayersAccessor; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plMultipassMtlDlg.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plMultipassMtlDlg.cpp index 76b09b95..609519c4 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plMultipassMtlDlg.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plMultipassMtlDlg.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "max.h" #include "MaxIcon.h" -#include "resource.h" +#include "../resource.h" #include "plMultipassMtl.h" #include "plMultipassMtlPB.h" //#include "plMaxLayer.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plNoteTrackWatcher.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plNoteTrackWatcher.cpp index afdf55a0..8ccbf012 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plNoteTrackWatcher.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plNoteTrackWatcher.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" -#include "resource.h" +#include "../resource.h" //// Watcher Class Desc ////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plParticleMtl.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plParticleMtl.cpp index b4c300d1..88c5a872 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plParticleMtl.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plParticleMtl.cpp @@ -25,17 +25,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plParticleMtl.h" -#include "resource.h" +#include "../resource.h" //extern ClassDesc2* GetMaxLayerDesc(); #include "Shaders.h" #include "iparamm2.h" -#include "../MaxMain/plPlasmaRefMsgs.h" -#include "plBMSampler.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "../plBMSampler.h" #include "stdmat.h" -#include "Layers/plLayerTex.h" -#include "Layers/plLayerTexBitmapPB.h" +#include "../Layers/plLayerTex.h" +#include "../Layers/plLayerTexBitmapPB.h" extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassAnimDlgProc.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plPassAnimDlgProc.cpp index ba01453c..2923d07a 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassAnimDlgProc.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassAnimDlgProc.cpp @@ -33,15 +33,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPassAnimDlgProc.h" #include "plPassBaseParamIDs.h" -#include "../MaxComponent/plNotetrackAnim.h" -#include "resource.h" +#include "MaxComponent/plNotetrackAnim.h" +#include "../resource.h" #include "iparamm2.h" #include "plAnimStealthNode.h" -#include "../MaxComponent/plMaxAnimUtils.h" -#include "../MaxComponent/plAnimComponent.h" -#include "../MaxExport/plErrorMsg.h" +#include "MaxComponent/plMaxAnimUtils.h" +#include "MaxComponent/plAnimComponent.h" +#include "MaxExport/plErrorMsg.h" const char *kPassNameNone = ENTIRE_ANIMATION_NAME; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtl.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtl.cpp index 21eb2c3c..1addfc6c 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtl.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtl.cpp @@ -25,10 +25,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plPassMtl.h" -#include "resource.h" +#include "../resource.h" //extern ClassDesc2* GetMaxLayerDesc(); -#include "Shaders.h" -#include "../MaxComponent/plMaxAnimUtils.h" +#include "../Shaders.h" +#include "MaxComponent/plMaxAnimUtils.h" #include "plPassBaseParamIDs.h" #include "plPassMtlBasicPB.h" @@ -36,8 +36,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "iparamm2.h" -#include "Layers/plLayerTex.h" -#include "Layers/plStaticEnvLayer.h" +#include "../Layers/plLayerTex.h" +#include "../Layers/plStaticEnvLayer.h" #include "hsBitVector.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlAnimPBDec.h b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlAnimPBDec.h index 5f78fe89..3e250ea2 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlAnimPBDec.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlAnimPBDec.h @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPassMtl.h" #include "plPassBaseParamIDs.h" -#include "resource.h" +#include "../resource.h" #include "iparamm2.h" #include "plPassAnimDlgProc.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.cpp b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.cpp index 74f53d10..f16dc431 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.cpp +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNoteTrackWatcher.h" #include "plAnimStealthNode.h" -#include "../MaxComponent/plMaxAnimUtils.h" -#include "../MaxMain/plPlasmaRefMsgs.h" +#include "MaxComponent/plMaxAnimUtils.h" +#include "MaxMain/plPlasmaRefMsgs.h" // For converting from a MAX Mtl #include "plPassMtl.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.h b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.h index 1006acb6..9fd70b52 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "Max.h" #include "iparamb2.h" -#include "../../PubUtilLib/plInterp/plAnimEaseTypes.h" +#include "plInterp/plAnimEaseTypes.h" class plNoteTrackWatcher; class plMtlChangeCallback; diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlLayersPBDec.h b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlLayersPBDec.h index 31e1ef3d..dca0d493 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlLayersPBDec.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlLayersPBDec.h @@ -25,11 +25,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPassMtl.h" #include "plPassMtlLayersPB.h" -#include "resource.h" +#include "../resource.h" #include "iparamm2.h" -#include "Layers/plLayerTex.h" +#include "../Layers/plLayerTex.h" class PassMtlLayersAccessor; extern PassMtlLayersAccessor gLayersAccessor; diff --git a/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp b/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp index b29986d2..81788958 100644 --- a/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp +++ b/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "bmmlib.h" #include "bitmap.h" -#include "Layers\plPlasmaMAXLayer.h" +#include "Layers/plPlasmaMAXLayer.h" #include "plBMSampler.h" plBMSampler::plBMSampler(plPlasmaMAXLayer *layer, Bitmap *bm) : fBM(bm), fInitialized(false) diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index 48e0444d..2636c0c9 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -5,7 +5,7 @@ if (DirectX_OLD_SDK) endif(DirectX_OLD_SDK) -if(DirectX_INCLUDE_DIR AND DirectX_LIBRARY) +if(DirectX_INCLUDE_DIR) set(DirectX_FIND_QUIETLY TRUE) endif() diff --git a/cmake/FindMaxSDK.cmake b/cmake/FindMaxSDK.cmake new file mode 100644 index 00000000..bc3d8117 --- /dev/null +++ b/cmake/FindMaxSDK.cmake @@ -0,0 +1,80 @@ +if(NOT 3dsm_PATH) + find_path(3dsm_PATH maxsdk) +else() + set(3dsm_FIND_QUIETLY TRUE) +endif() + +find_path(3dsm_INCLUDE_DIR maxapi.h + ${3dsm_PATH}/maxsdk/include +) + +find_library(3dsm_BMM_LIBRARY bmm + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_CORE_LIBRARY core + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_CUSTDLG_LIBRARY CustDlg + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_GEOM_LIBRARY geom + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_GFX_LIBRARY gfx + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_GUP_LIBRARY gup + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_MANIPSYS_LIBRARY manipsys + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_MAXSCRPT_LIBRARY Maxscrpt + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_MAXUTIL_LIBRARY maxutil + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_MESH_LIBRARY mesh + PATHS "${3dsm_PATH}/maxsdk/lib") + +find_library(3dsm_PARAMBLK2_LIBRARY paramblk2 + PATHS "${3dsm_PATH}/maxsdk/lib") + +set(3dsm_LIBRARIES + ${3dsm_BMM_LIBRARY} + ${3dsm_CORE_LIBRARY} + ${3dsm_CUSTDLG_LIBRARY} + ${3dsm_GEOM_LIBRARY} + ${3dsm_GFX_LIBRARY} + ${3dsm_GUP_LIBRARY} + ${3dsm_MANIPSYS_LIBRARY} + ${3dsm_MAXSCRPT_LIBRARY} + ${3dsm_MAXUTIL_LIBRARY} + ${3dsm_MESH_LIBRARY} + ${3dsm_PARAMBLK2_LIBRARY} +) + +mark_as_advanced( + 3dsm_BMM_LIBRARY + 3dsm_CORE_LIBRARY + 3dsm_CUSTDLG_LIBRARY + 3dsm_GEOM_LIBRARY + 3dsm_GFX_LIBRARY + 3dsm_GUP_LIBRARY + 3dsm_MANIPSYS_LIBRARY + 3dsm_MAXSCRPT_LIBRARY + 3dsm_MAXUTIL_LIBRARY + 3dsm_MESH_LIBRARY + 3dsm_PARAMBLK2_LIBRARY +) + +if(3dsm_INCLUDE_DIR AND 3dsm_MESH_LIBRARY) + set(3dsm_FOUND TRUE) +endif() + +if (3dsm_FOUND) + if(NOT 3dsm_FIND_QUIETLY) + message(STATUS "Found 3ds Max SDK: ${3dsm_PATH}") + endif() +endif() \ No newline at end of file