diff --git a/Sources/Tools/MaxComponent/CMakeLists.txt b/Sources/Tools/MaxComponent/CMakeLists.txt index 670cc548..4baff985 100644 --- a/Sources/Tools/MaxComponent/CMakeLists.txt +++ b/Sources/Tools/MaxComponent/CMakeLists.txt @@ -52,7 +52,6 @@ set(MaxComponent_HEADERS plGrassComponent.h plGUICompClassIDs.h plGUIComponents.h - plImpactGadgetComponent.h plInventoryObjComponent.h plLightGrpComponent.h plLightMapComponent.h @@ -109,7 +108,6 @@ set(MaxComponent_SOURCES plAnimCompProc.cpp plAnimEventComponent.cpp plAudioComponents.cpp - plAutoComponent.cpp plAutoUIBase.cpp plAutoUIBlock.cpp plAutoUIComp.cpp @@ -126,7 +124,6 @@ set(MaxComponent_SOURCES plClimbComponent.cpp plClothingComponent.cpp plClusterComponent.cpp - plComponent.cpp plComponentBase.cpp plComponentMgr.cpp plComponentTools.cpp @@ -139,7 +136,6 @@ set(MaxComponent_SOURCES plGrassComponent.cpp plGUIComponents.cpp plIgnoreComponent.cpp - plImpactGadgetComponent.cpp plInventoryObjComponent.cpp plLightGrpComponent.cpp plLightMapComponent.cpp @@ -185,6 +181,7 @@ set(MaxComponent_SOURCES plXImposter.cpp ) +use_precompiled_header(Pch.h Pch.cpp MaxComponent_HEADERS MaxComponent_SOURCES) add_library(MaxComponent STATIC ${MaxComponent_HEADERS} diff --git a/Sources/Tools/MaxComponent/plComponent.cpp b/Sources/Tools/MaxComponent/Pch.cpp similarity index 87% rename from Sources/Tools/MaxComponent/plComponent.cpp rename to Sources/Tools/MaxComponent/Pch.cpp index 3b767288..0ff2c657 100644 --- a/Sources/Tools/MaxComponent/plComponent.cpp +++ b/Sources/Tools/MaxComponent/Pch.cpp @@ -39,9 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "plComponent.h" -#include "plComponentReg.h" // Needed for the kTargs enum -#include "MaxMain/plMaxNode.h" +#include "Pch.h" +/** + * \file Pch.cpp + * \brief Precompiled Header object for MaxComponent + * + * This file prompts MSVC to generate a PCH file for the MaxComponent project. It + * has no function if precompiled headers are disabled in cmake. + */ \ No newline at end of file diff --git a/Sources/Tools/MaxComponent/plAutoComponent.cpp b/Sources/Tools/MaxComponent/Pch.h similarity index 50% rename from Sources/Tools/MaxComponent/plAutoComponent.cpp rename to Sources/Tools/MaxComponent/Pch.h index a527092a..c22008d9 100644 --- a/Sources/Tools/MaxComponent/plAutoComponent.cpp +++ b/Sources/Tools/MaxComponent/Pch.h @@ -39,61 +39,86 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -// Don't delete this, I use it for testing -Colin -#if 0 - -#include "max.h" -#include "resource.h" -#include "plComponent.h" -#include "plComponentReg.h" - -#include "plAutoUIComp.h" - -#include "plActivatorComponent.h" - -class plAutoComponent : public plComponent -{ -public: - plAutoComponent(); - bool Convert(plMaxNode *node, plErrorMsg *msg); -}; +#ifndef _MaxComponent_Pch_inc_ +#define _MaxComponent_Pch_inc_ -AUTO_CLASS_DESC(plAutoComponent, gAutoDesc, "Auto", "Auto", "Test", Class_ID(0x21807fcf, 0x156e2218)) +/** + * \file Pch.h + * \brief Precompiled Header for MaxComponent + */ -plAutoUIComp *gAutoUI; +// Standard Library +#include +#include +#include +#include +#include -void DummyCode() -{ - gAutoUI = new plAutoUIComp(&gAutoDesc); - - gAutoUI->AddCheckBox(0, "test", "Test", true); - gAutoUI->AddFloatSpinner(1, "t2", "T2", 0.5, 0.f, 100.f); - gAutoUI->AddEditBox(2, "blah", "Blah", "Test String", 5); - gAutoUI->AddPickNode(3, "pick", "Pick"); - - std::vector cids; - cids.push_back(ACTIVATOR_CID); - cids.push_back(RESPONDER_CID); - gAutoUI->AddPickNode(4, "pick2", "Pick2", &cids); -} - -plAutoComponent::plAutoComponent() -{ - fClassDesc = &gAutoDesc; - fClassDesc->MakeAutoParamBlocks(this); -} +// Core Plasma +#include "HeadSpin.h" +#include "plAudible.h" +#include "plCreatableIndex.h" +#include "plgDispatch.h" +#include "plFileUtils.h" +#include "hsFiles.h" +#include "hsGeometry3.h" +#include "plLoadMask.h" +#include "hsMatrix44.h" +#include "plPhysical.h" +#include "plQuality.h" +#include "hsResMgr.h" +#include "hsStlSortUtils.h" +#include "hsStream.h" +#include "hsStringTokenizer.h" +#include "hsTemplates.h" +#include "hsThread.h" +#include "plTweak.h" + +// Windows +#include "hsWindows.h" +#include +#include +#include + +// These MaxComponent headers will trigger a rebuild if they are changed +// So it's probably best to precompile them anyway. +// Some of these may include 3dsm headers, so ensure they come after hsWindows.h +#include "plComponent.h" +#include "plComponentProcBase.h" +#include "plComponentReg.h" -bool plAutoComponent::Convert(plMaxNode *node, plErrorMsg *msg) -{ - bool c1 = gAutoUI->GetCheckBox(0, this); - TSTR str = gAutoUI->GetEditBox(2, this); +#include "plActivatorBaseComponent.h" +#include "plAnimEventComponent.h" +#include "plAnimComponent.h" +#include "plAudioComponents.h" +#include "plBehavioralComponents.h" +#include "plPhysicalComponents.h" +#include "plMiscComponents.h" +#include "plResponderComponent.h" - for (int i = 0; i < gAutoUI->Count(3, this); i++) - INode *node = gAutoUI->GetPickNode(3, this, i); - - return true; -} +#include "resource.h" -#endif \ No newline at end of file +// Useful Stuff from MaxMain +// Changing any of this would likely cause a rebuild, regardless of it being here. +#include "MaxMain/MaxCompat.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNodeData.h" + +// 3ds Max SDK +// This stuff should ALWAYS come after hsWindows.h +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if MAX_VERSION_MAJOR >= 13 +# include +#endif + +#endif // _MaxComponent_Pch_inc_ diff --git a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp index d9126f1e..385f1959 100644 --- a/Sources/Tools/MaxComponent/pfGUISkinComp.cpp +++ b/Sources/Tools/MaxComponent/pfGUISkinComp.cpp @@ -39,16 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" #include "hsTemplates.h" +#include "hsWindows.h" -#include "pfGUISkinComp.h" -#include "plGUICompClassIDs.h" +#include +#include -#include "MaxMain/plMaxNodeBase.h" #include "MaxMain/MaxCompat.h" +#include "MaxMain/plMaxNodeBase.h" +#include "resource.h" +#pragma hdrstop + +#include "pfGUISkinComp.h" +#include "plGUICompClassIDs.h" pfGUISkinEditProc *pfGUISkinEditProc::fInstance = nil; diff --git a/Sources/Tools/MaxComponent/plAGComponents.cpp b/Sources/Tools/MaxComponent/plAGComponents.cpp index f868f833..5a2c00a9 100644 --- a/Sources/Tools/MaxComponent/plAGComponents.cpp +++ b/Sources/Tools/MaxComponent/plAGComponents.cpp @@ -39,16 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -//Resource related -#include "resource.h" -//Max related +#include "plgDispatch.h" +#include "pnKeyedObject/plKey.h" +#include "hsResMgr.h" + #include "plComponent.h" #include "plComponentReg.h" +#include "resource.h" + +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNodeData.h" +#pragma hdrstop //Messages related -#include "plgDispatch.h" #include "pnMessage/plObjRefMsg.h" #include "pnMessage/plIntRefMsg.h" #include "pnMessage/plNodeRefMsg.h" @@ -57,12 +61,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //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 "hsResMgr.h" //Conversion related #include "MaxConvert/hsConverterUtils.h" diff --git a/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp b/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp index c1fe5739..be49e11d 100644 --- a/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp +++ b/Sources/Tools/MaxComponent/plActivatorBaseComponent.cpp @@ -39,15 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "plActivatorBaseComponent.h" #include "pnKeyedObject/plKey.h" +#include "hsResMgr.h" + +#include "plActivatorBaseComponent.h" #include "MaxMain/plMaxNode.h" +#pragma hdrstop #include "plModifier/plLogicModifier.h" #include "pnSceneObject/plSceneObject.h" -#include "hsResMgr.h" #include "pnMessage/plObjRefMsg.h" void plActivatorBaseComponent::AddReceiverKey(plKey pKey, plMaxNode* node) diff --git a/Sources/Tools/MaxComponent/plActivatorComponent.cpp b/Sources/Tools/MaxComponent/plActivatorComponent.cpp index 7e095468..12184884 100644 --- a/Sources/Tools/MaxComponent/plActivatorComponent.cpp +++ b/Sources/Tools/MaxComponent/plActivatorComponent.cpp @@ -39,9 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" + #include "plComponent.h" #include "plComponentReg.h" +#pragma hdrstop void DummyCodeIncludeFuncActive() {} diff --git a/Sources/Tools/MaxComponent/plAnimCompProc.cpp b/Sources/Tools/MaxComponent/plAnimCompProc.cpp index 6fd7cb31..5c639c31 100644 --- a/Sources/Tools/MaxComponent/plAnimCompProc.cpp +++ b/Sources/Tools/MaxComponent/plAnimCompProc.cpp @@ -39,16 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "plAnimCompProc.h" -#include "MaxMain/plMaxNode.h" +#include "plAnimComponent.h" #include "plComponentBase.h" +#include "MaxMain/plMaxNode.h" + +#include +#include +#pragma hdrstop + +#include "plAnimCompProc.h" #include "plPickNode.h" -#include "plAnimComponent.h" +#include "plPickNodeBase.h" +#include "plNotetrackAnim.h" #include "plInterp/plAnimEaseTypes.h" +#include "plPickMaterialMap.h" +#include "MaxMain/plMtlCollector.h" + plAnimCompProc::plAnimCompProc() : fCompButtonID(0), fCompParamID(0), @@ -295,8 +304,6 @@ void plMtlAnimProc::IUpdateNodeButton(HWND hWnd, IParamBlock2* pb) ILoadAnimCombo(hWnd, pb); } -#include "plNotetrackAnim.h" - void plMtlAnimProc::ILoadAnimCombo(HWND hWnd, IParamBlock2* pb) { HWND hAnim = GetDlgItem(hWnd, fAnimComboID); @@ -331,9 +338,6 @@ void plMtlAnimProc::ILoadAnimCombo(HWND hWnd, IParamBlock2* pb) ILoadUser(hWnd, pb); } -#include "plPickMaterialMap.h" -#include "MaxMain/plMtlCollector.h" - void plMtlAnimProc::IMtlButtonPress(HWND hWnd, IParamBlock2* pb) { // Let the user pick a new material @@ -395,9 +399,6 @@ Mtl* plMtlAnimProc::IGetMtl(IParamBlock2* pb) return pb->GetMtl(fMtlParamID); } - -#include "plPickNodeBase.h" - static const char* kUserTypeAll = "(All)"; class plPickAllMtlNode : public plPickMtlNode diff --git a/Sources/Tools/MaxComponent/plAnimCompProc.h b/Sources/Tools/MaxComponent/plAnimCompProc.h index 61adbe2c..b97699b4 100644 --- a/Sources/Tools/MaxComponent/plAnimCompProc.h +++ b/Sources/Tools/MaxComponent/plAnimCompProc.h @@ -42,11 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimCompProc_h_inc #define plAnimCompProc_h_inc -#include "max.h" -#include "iparamm2.h" - class plComponentBase; class plMaxNode; +class IParamBlock2; class plAnimCompProc : public ParamMap2UserDlgProc { diff --git a/Sources/Tools/MaxComponent/plAnimComponent.cpp b/Sources/Tools/MaxComponent/plAnimComponent.cpp index 51c3093d..28b5b585 100644 --- a/Sources/Tools/MaxComponent/plAnimComponent.cpp +++ b/Sources/Tools/MaxComponent/plAnimComponent.cpp @@ -39,21 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "resource.h" +#include "hsResMgr.h" #include "plAnimComponent.h" #include "plComponentProcBase.h" #include "plPhysicalComponents.h" #include "plMiscComponents.h" + +#include "MaxMain/plMaxNode.h" +#include "resource.h" +#pragma hdrstop + #include "MaxMain/plPhysicalProps.h" +#include "pnMessage/plNodeRefMsg.h" #include "pnSceneObject/plSceneObject.h" #include "plInterp/plController.h" #include "plNotetrackAnim.h" -#include "hsResMgr.h" #include "plAvatar/plAGModifier.h" #include "plAvatar/plAGChannel.h" #include "plAvatar/plAGAnim.h" @@ -61,13 +65,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plMatrixChannel.h" #include "plAvatar/plPointChannel.h" #include "plAvatar/plScalarChannel.h" -#include "MaxMain/plMaxNode.h" #include "MaxConvert/hsControlConverter.h" #include "pnKeyedObject/plUoid.h" #include "plMaxAnimUtils.h" #include "MaxPlasmaLights/plRealTimeLightBase.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" #include "pfAnimation/plLightModifier.h" #include "pnKeyedObject/plMsgForwarder.h" @@ -83,6 +87,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // So that the linker won't throw this code away, since it doesn't appear to be used void DummyCodeIncludeFunc() {} +plEaseAccessor gAnimCompEaseAccessor(plComponentBase::kBlkComp, + kAnimEaseInMin, kAnimEaseInMax, kAnimEaseInLength, + kAnimEaseOutMin, kAnimEaseOutMax, kAnimEaseOutLength); + bool HasPhysicalComponent(plMaxNodeBase *node, bool searchChildren) { int i; @@ -572,9 +580,6 @@ bool plAnimGroupedComponent::GetKeyList( INode *restrictedNode, hsTArray -#include "plComponent.h" -#include "plComponentReg.h" #include "pnKeyedObject/plKey.h" #include "hsTemplates.h" + +#include "plComponent.h" +#include "plComponentReg.h" #include "plAnimObjInterface.h" -#include "plNoteTrackDlgComp.h" -#include "MaxPlasmaMtls/Materials/plPassMtlBase.h" +#include "plNotetrackDlgComp.h" + +#include +#include + #define ANIM_COMP_CID Class_ID(0x32e77ab, 0x28a80383) #define ANIM_GROUP_COMP_CID Class_ID(0x341a57fc, 0x4cda6c64) @@ -84,19 +87,16 @@ enum kAnimPhysAnim, }; -static plEaseAccessor gAnimCompEaseAccessor(plComponentBase::kBlkComp, - kAnimEaseInMin, kAnimEaseInMax, kAnimEaseInLength, - kAnimEaseOutMin, kAnimEaseOutMax, kAnimEaseOutLength); - +class plAGAnim; +class plAGApplicator; +class plAGMasterMod; class plComponentBase; +class plController; +class plEaseAccessor; class plMaxNode; +class plMsgForwarder; class plSimpleTMModifier; class plLightModifier; -class plAGMasterMod; -class plAGAnim; -class plMsgForwarder; -class plController; -class plAGApplicator; class plAnimComponentBase : public plComponent, public plAnimObjInterface { diff --git a/Sources/Tools/MaxComponent/plAnimEventComponent.cpp b/Sources/Tools/MaxComponent/plAnimEventComponent.cpp index 7901a948..0472f654 100644 --- a/Sources/Tools/MaxComponent/plAnimEventComponent.cpp +++ b/Sources/Tools/MaxComponent/plAnimEventComponent.cpp @@ -39,11 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsResMgr.h" + #include "plAnimEventComponent.h" #include "plComponentReg.h" #include "resource.h" + #include "MaxMain/plMaxNode.h" +#pragma hdrstop #include "plAnimComponent.h" #include "plNotetrackAnim.h" @@ -53,7 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier/plAnimEventModifier.h" #include "plMessage/plAnimCmdMsg.h" -#include "hsResMgr.h" #include "pnMessage/plRefMsg.h" void DummyCodeIncludeFuncAnimDetector() {} diff --git a/Sources/Tools/MaxComponent/plAnimEventComponent.h b/Sources/Tools/MaxComponent/plAnimEventComponent.h index 667aed69..98fb112e 100644 --- a/Sources/Tools/MaxComponent/plAnimEventComponent.h +++ b/Sources/Tools/MaxComponent/plAnimEventComponent.h @@ -44,6 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plActivatorBaseComponent.h" +class plErrorMsg; +class plMaxNode; + #define ANIMEVENT_CID Class_ID(0x32eb34af, 0x62c70002) #define MTLEVENT_CID Class_ID(0x2984243c, 0x30ea3acb) diff --git a/Sources/Tools/MaxComponent/plAudioComponents.cpp b/Sources/Tools/MaxComponent/plAudioComponents.cpp index 4ef8b904..fa5326ec 100644 --- a/Sources/Tools/MaxComponent/plAudioComponents.cpp +++ b/Sources/Tools/MaxComponent/plAudioComponents.cpp @@ -39,16 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plComponentProcBase.h" +#include "plgDispatch.h" +#include "plFileUtils.h" -#include "resource.h" +#include "plAnimComponent.h" +#include "plAudioComponents.h" #include "plComponent.h" +#include "plComponentProcBase.h" #include "plComponentReg.h" -#include -#include "plAudioComponents.h" #include "plMiscComponents.h" -#include "plAnimComponent.h" +#include "MaxMain/MaxCompat.h" +#include "resource.h" + +#include +#include +#pragma hdrstop + + #include "plInterp/plAnimEaseTypes.h" #include "plAvatar/plAGAnim.h" @@ -59,23 +68,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxMain/plPluginResManager.h" #include "MaxMain/plPlasmaRefMsgs.h" - -#include "plgDispatch.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 "MaxMain/MaxCompat.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" @@ -92,13 +95,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudio/plWin32StreamingSound.h" #include "plAudio/plWin32GroupedSound.h" #include "plAudioCore/plSoundBuffer.h" -#include "plFileUtils.h" // Valdez Asset Manager Related #ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/MaxAssInterface.h" +# include "../../AssetMan/PublicInterface/MaxAssInterface.h" #endif -#include // Fun soft volume stuff #include "plSoftVolumeComponent.h" @@ -111,8 +112,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // EAX stuff #include "plAudio/plEAXListenerMod.h" #ifdef EAX_SDK_AVAILABLE -#include -#include +# include +# include #endif #include "plResMgr/plLocalization.h" diff --git a/Sources/Tools/MaxComponent/plAudioComponents.h b/Sources/Tools/MaxComponent/plAudioComponents.h index 43b7a3d7..9bc4d797 100644 --- a/Sources/Tools/MaxComponent/plAudioComponents.h +++ b/Sources/Tools/MaxComponent/plAudioComponents.h @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#ifndef _plAudioComponents_h_inc_ +#define _plAudioComponents_h_inc_ + #define SOUND_3D_COMPONENT_ID Class_ID(0x1be5543f, 0x746f3a97) #define BGND_MUSIC_COMPONENT_ID Class_ID(0x16b5b2a, 0x33c75095) #define RANDOM_SOUND_COMPONENT_ID Class_ID(0x35033e37, 0x499568fb) @@ -46,11 +50,15 @@ 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 + +#include "plComponent.h" #include "pnKeyedObject/plKey.h" +#include "hsTemplates.h" + #ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/AssManBaseTypes.h" +# include "../../AssetMan/PublicInterface/AssManBaseTypes.h" #endif -#include "hsTemplates.h" class plComponentBase; class plMaxNode; @@ -66,7 +74,7 @@ namespace plAudioComp bool IsSoundComponent(plComponentBase *comp); bool IsLocalOnly( plComponentBase *comp ); -} +}; class plBaseSoundEmitterComponent : public plComponent { @@ -212,3 +220,5 @@ public: }; +#endif // _plAudioComponents_h_inc_ + diff --git a/Sources/Tools/MaxComponent/plAutoUIBase.cpp b/Sources/Tools/MaxComponent/plAutoUIBase.cpp index 9c14e7e7..3d2bee68 100644 --- a/Sources/Tools/MaxComponent/plAutoUIBase.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIBase.cpp @@ -40,14 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plAutoUIBase.h" - -#include "max.h" -#include "iparamb2.h" +#include "hsWindows.h" -#include "plAutoUIParams.h" +#include +#include #include "resource.h" +#pragma hdrstop + +#include "plAutoUIBase.h" +#include "plAutoUIParams.h" #include "plGUICompClassIDs.h" diff --git a/Sources/Tools/MaxComponent/plAutoUIBase.h b/Sources/Tools/MaxComponent/plAutoUIBase.h index a6f4831e..f838d833 100644 --- a/Sources/Tools/MaxComponent/plAutoUIBase.h +++ b/Sources/Tools/MaxComponent/plAutoUIBase.h @@ -42,12 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAutoUIBase_h_inc #define plAutoUIBase_h_inc -//#include "max.h" -//#include "plComponentBase.h" -//#include "plComponentReg.h" - -#include "HeadSpin.h" - #include class ParamBlockDesc2; diff --git a/Sources/Tools/MaxComponent/plAutoUIBlock.cpp b/Sources/Tools/MaxComponent/plAutoUIBlock.cpp index 767704ab..73df5dd0 100644 --- a/Sources/Tools/MaxComponent/plAutoUIBlock.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIBlock.cpp @@ -39,16 +39,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "plAutoUIBlock.h" -#include "max.h" -#include "iparamb2.h" +#include "HeadSpin.h" #include "plComponentReg.h" - #include "resource.h" +#include +#pragma hdrstop + +#include "plAutoUIBlock.h" + + plAutoUIBlock::plAutoUIBlock(plComponentClassDesc *cd, int blockID, const char *name, int version) { fName = hsStrcpy(name); diff --git a/Sources/Tools/MaxComponent/plAutoUIComp.cpp b/Sources/Tools/MaxComponent/plAutoUIComp.cpp index a58046bd..b77079a4 100644 --- a/Sources/Tools/MaxComponent/plAutoUIComp.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIComp.cpp @@ -40,12 +40,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plAutoUIComp.h" +#include "hsWindows.h" #include +#include +#include +#include +#include + #include "resource.h" -#include "notify.h" +#pragma hdrstop + +#include "plAutoUIComp.h" //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plAutoUIComp.h b/Sources/Tools/MaxComponent/plAutoUIComp.h index c2553c4b..fb6661fe 100644 --- a/Sources/Tools/MaxComponent/plAutoUIComp.h +++ b/Sources/Tools/MaxComponent/plAutoUIComp.h @@ -41,10 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plAutoUIBase.h" -#include "max.h" #include "plComponentBase.h" #include "plComponentReg.h" +class INode; + class plAutoUIComp : public plAutoUIBase { public: diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.cpp b/Sources/Tools/MaxComponent/plAutoUIParams.cpp index 8ca427f2..a7973d62 100644 --- a/Sources/Tools/MaxComponent/plAutoUIParams.cpp +++ b/Sources/Tools/MaxComponent/plAutoUIParams.cpp @@ -39,14 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include + +#include "plComponentBase.h" +#include "MaxMain/plMaxNode.h" +#pragma hdrstop + #include "plAutoUIParams.h" #include "MaxMain/plMaxAccelerators.h" -#include -#include "MaxMain/plMaxNode.h" -#include "plComponentBase.h" +#include "plPickNode.h" +#include "plPickMaterialMap.h" +#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" +#include "plSurface/plLayerInterface.h" +#include "plGImage/plDynamicTextMap.h" plAutoUIParam::plAutoUIParam(ParamID id, const char *name) : fID(id), fName(hsStrcpy(name)), fVisID(-1), fHeight(0) @@ -446,8 +455,6 @@ const char* plEditParam::GetString(IParamBlock2 *pb) /////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////// -#include "plPickNode.h" - plPickListParam::plPickListParam(ParamID id, const char *name, std::vector* filter) : plAutoUIParam(id, name), fhList(nil), fhAdd(nil), fhRemove(nil) { @@ -880,11 +887,6 @@ plComponentBase *plPickActivatorListParam::GetComponent(IParamBlock2 *pb, int id /////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////// -#include "plPickMaterialMap.h" -#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" -#include "plSurface/plLayerInterface.h" -#include "plGImage/plDynamicTextMap.h" - plPickDynamicTextButtonParam::plPickDynamicTextButtonParam(ParamID id, const char *name) : plPickButtonParam(id, name, nil, false) { diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.h b/Sources/Tools/MaxComponent/plAutoUIParams.h index 4c4c996c..6b09fe42 100644 --- a/Sources/Tools/MaxComponent/plAutoUIParams.h +++ b/Sources/Tools/MaxComponent/plAutoUIParams.h @@ -39,9 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "iparamb2.h" -#include "HeadSpin.h" + #include "hsTemplates.h" #include @@ -372,7 +370,7 @@ public: class plPickMaterialAnimationButtonParam : public plPickButtonParam { protected: - hsTArray fKeys; + hsTArray fKeys; // FIXME: std::vector public: plPickMaterialAnimationButtonParam(ParamID id, const char *name); diff --git a/Sources/Tools/MaxComponent/plAvatarComponent.cpp b/Sources/Tools/MaxComponent/plAvatarComponent.cpp index 7f90aaaf..afff8249 100644 --- a/Sources/Tools/MaxComponent/plAvatarComponent.cpp +++ b/Sources/Tools/MaxComponent/plAvatarComponent.cpp @@ -39,28 +39,37 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include +#include "plgDispatch.h" +#include "hsResMgr.h" +#include "hsStringTokenizer.h" #include "plComponentProcBase.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "plAudioComponents.h" +#include "plPhysicalComponents.h" +#include "MaxMain/plMaxNode.h" + +#include "resource.h" +#include +#pragma hdrstop + +#include "plAvatarComponent.h" +#include "plMaxAnimUtils.h" +#include "plPickNode.h" +#include "plPickMaterialMap.h" + #include "MaxConvert/hsConverterUtils.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 "hsStringTokenizer.h" -#include "MaxMain/plMaxNode.h" -#include "pnKeyedObject/plKey.h" - -#include "hsResMgr.h" #include "pnMessage/plNodeRefMsg.h" #include "pnMessage/plObjRefMsg.h" @@ -68,7 +77,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage/plMatRefMsg.h" #include "plMessage/plLayRefMsg.h" -#include "plMaxAnimUtils.h" #include "plInterp/plController.h" #include "plPhysical/plSimDefs.h" #include "plPhysicsGroups.h" @@ -79,7 +87,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSurface/hsGMaterial.h" #include "plAudio/plWin32StaticSound.h" #include "plAudioCore/plSoundBuffer.h" -#include "plAudioComponents.h" #include "MaxMain/plPlasmaRefMsgs.h" @@ -95,15 +102,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plShadowComponents.h" #include "plGLight/plShadowCaster.h" -#include "plAvatarComponent.h" -#include "plPhysicalComponents.h" - #include "MaxMain/plPhysicalProps.h" -//#include -//#include -#include "plPickNode.h" -#include "plPickMaterialMap.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 fba01d16..59168093 100644 --- a/Sources/Tools/MaxComponent/plAvatarComponent.h +++ b/Sources/Tools/MaxComponent/plAvatarComponent.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef __PLAVATARCOMPONENT_H__ #define __PLAVATARCOMPONENT_H__ -#include "max.h" #include "plAvatar/plCritterCommands.h" #include "plAvatar/plPuppetCommands.h" diff --git a/Sources/Tools/MaxComponent/plBehavioralComponents.cpp b/Sources/Tools/MaxComponent/plBehavioralComponents.cpp index 4be090b9..551905d4 100644 --- a/Sources/Tools/MaxComponent/plBehavioralComponents.cpp +++ b/Sources/Tools/MaxComponent/plBehavioralComponents.cpp @@ -39,19 +39,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plBehavioralComponents.h" +#include "hsResMgr.h" + #include "plComponentReg.h" +#include "plBehavioralComponents.h" +#include "plResponderComponent.h" +#include "MaxMain/plMaxNode.h" #include "resource.h" -#include "MaxMain/plMaxNode.h" +#include +#pragma hdrstop + #include "MaxMain/plPhysicalProps.h" -#include "hsResMgr.h" -#include "pnKeyedObject/plKey.h" #include "plAvatar/plSittingModifier.h" -#include "plResponderComponent.h" - #include "plPickNode.h" void DummyCodeIncludeFuncBehaviors() {} diff --git a/Sources/Tools/MaxComponent/plBipedKiller.cpp b/Sources/Tools/MaxComponent/plBipedKiller.cpp index a746e286..19fe193c 100644 --- a/Sources/Tools/MaxComponent/plBipedKiller.cpp +++ b/Sources/Tools/MaxComponent/plBipedKiller.cpp @@ -40,36 +40,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -// BIPEDKILLER - -/////////// -// -// INCLUDES -// -/////////// - -// theirs -#include - -#include "max.h" -#include "resource.h" -#include "CS/bipexp.h" -#include "decomp.h" - -#pragma warning(disable: 4786) // disable warnings about excessive STL symbol name length - -#include -#include #include "hsStlSortUtils.h" -// ours #include "plComponent.h" #include "plComponentReg.h" #include "plMiscComponents.h" #include "MaxMain/plMaxNodeBase.h" +#include +#include +#include + +#include +#include +#include "resource.h" +#pragma hdrstop + +#include "BipedKiller.h" #include "plTransform/hsAffineParts.h" -#include "hsMatrix44.h" ////////////// // diff --git a/Sources/Tools/MaxComponent/plBlowComponent.cpp b/Sources/Tools/MaxComponent/plBlowComponent.cpp index a56d5827..588fcb2d 100644 --- a/Sources/Tools/MaxComponent/plBlowComponent.cpp +++ b/Sources/Tools/MaxComponent/plBlowComponent.cpp @@ -39,24 +39,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "meshdlib.h" -#include "dummy.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "MaxMain/plPlasmaRefMsgs.h" - #include "MaxMain/plMaxNode.h" -#include "HeadSpin.h" +#include +#include + +#include "resource.h" +#pragma hdrstop + + +#include "MaxMain/plPlasmaRefMsgs.h" #include "plBlowComponent.h" +#include "plFlexibilityComponent.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 a87686a8..3c4aef03 100644 --- a/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp +++ b/Sources/Tools/MaxComponent/plCAnimParamBlock.cpp @@ -56,13 +56,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// -#include "plCAnimParamBlock.h" - -#include "plInterp/plAnimEaseTypes.h" #include "plAnimComponent.h" + #include "resource.h" +#pragma hdrstop +#include "plInterp/plAnimEaseTypes.h" + +#include "plCAnimParamBlock.h" +#include "MaxPlasmaMtls/Materials/plPassMtl.h" +// Defined in plAnimComponent.cpp +extern plEaseAccessor gAnimCompEaseAccessor; //// Static ParamBlock Template ////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plCAnimParamBlock.h b/Sources/Tools/MaxComponent/plCAnimParamBlock.h index 5ca2f833..5a5c02ec 100644 --- a/Sources/Tools/MaxComponent/plCAnimParamBlock.h +++ b/Sources/Tools/MaxComponent/plCAnimParamBlock.h @@ -61,11 +61,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plCAnimParamBlock_h #define _plCAnimParamBlock_h -#include "HeadSpin.h" -#include "Max.h" -#include "iparamb2.h" -#include "iparamm2.h" - /// Note: the namespace is so our enums and such don't clash with anything /// else diff --git a/Sources/Tools/MaxComponent/plCameraComponent.cpp b/Sources/Tools/MaxComponent/plCameraComponent.cpp index 4480ba18..98d3346b 100644 --- a/Sources/Tools/MaxComponent/plCameraComponent.cpp +++ b/Sources/Tools/MaxComponent/plCameraComponent.cpp @@ -39,26 +39,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "HeadSpin.h" +#include "hsResMgr.h" + #include "plCameraComponent.h" -#include "resource.h" -#include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" + +#include +#include "resource.h" +#pragma hdrstop + + #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 "hsResMgr.h" -#include "MaxMain/plMaxNode.h" #include "MaxConvert/plConvert.h" #include "MaxMain/plPhysicalProps.h" -//#include "plHavok1/plHKPhysicsGroups.h" void DummyCodeIncludeFuncCamera() {} diff --git a/Sources/Tools/MaxComponent/plCameraComponent.h b/Sources/Tools/MaxComponent/plCameraComponent.h index 6f46e030..2dd40a23 100644 --- a/Sources/Tools/MaxComponent/plCameraComponent.h +++ b/Sources/Tools/MaxComponent/plCameraComponent.h @@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plComponent.h" +class plErrorMsg; class plMaxNode; #define CAMERACMD_CID Class_ID(0x6edb72d1, 0xd8a1f43) diff --git a/Sources/Tools/MaxComponent/plCameraComponents.cpp b/Sources/Tools/MaxComponent/plCameraComponents.cpp index 9e373567..afa66cda 100644 --- a/Sources/Tools/MaxComponent/plCameraComponents.cpp +++ b/Sources/Tools/MaxComponent/plCameraComponents.cpp @@ -39,23 +39,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plgDispatch.h" +#include "hsResMgr.h" -#include "max.h" //Max Dependencies +#include "plComponentReg.h" +#include "plAnimComponent.h" +#include "plCameraComponents.h" +#include "plMiscComponents.h" +#include "plPhysicalComponents.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNodeData.h" -#include "resource.h" //Resource Dependencies -#include "hsResMgr.h" // Ibid +#include +#include +#include + +#include "resource.h" +#pragma hdrstop -#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 @@ -63,7 +69,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysical/plSimDefs.h" -#include "plgDispatch.h" //Message Dependencies #include "pnMessage/plObjRefMsg.h" // Ibid #include "pnMessage/plIntRefMsg.h" // Ibid #include "pnMessage/plNodeRefMsg.h" // Ibid @@ -74,9 +79,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfCamera/plCameraBrain.h" #include "pfCamera/plCameraModifier.h" -#include "plMiscComponents.h" #include "MaxMain/plPhysicalProps.h" -#include "plPhysicalComponents.h" // Line Follow related #include "plInterp/plAnimPath.h" @@ -84,9 +87,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfAnimation/plLineFollowMod.h" #include "pfAnimation/plFollowMod.h" -#include -#include - // // DummyCodeIncludeFuncPhys Function. // Necessary to keep the compiler from throwing away this file. diff --git a/Sources/Tools/MaxComponent/plClickDragComponent.cpp b/Sources/Tools/MaxComponent/plClickDragComponent.cpp index aeeea573..96eb1c0a 100644 --- a/Sources/Tools/MaxComponent/plClickDragComponent.cpp +++ b/Sources/Tools/MaxComponent/plClickDragComponent.cpp @@ -39,16 +39,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plClickDragComponent.h" -#include "resource.h" +#include "plgDispatch.h" +#include "hsResMgr.h" + #include "plComponent.h" #include "plComponentReg.h" #include "plAnimComponent.h" +#include "plActivatorBaseComponent.h" +#include "plNoteTrackDlgComp.h" +#include "MaxMain/plMaxNode.h" + +#include +#include "resource.h" +#pragma hdrstop + +#include "plClickDragComponent.h" + #include "pnSceneObject/plSceneObject.h" #include "pnKeyedObject/hsKeyedObject.h" -#include "pnKeyedObject/plKey.h" #include "plPhysical/plCollisionDetector.h" // MM #include "plModifier/plLogicModifier.h" @@ -64,12 +75,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plEventCallbackMsg.h" #include "plMessage/plAnimCmdMsg.h" -#include "hsResMgr.h" -#include "MaxMain/plMaxNode.h" #include "MaxConvert/plConvert.h" #include "plResponderComponent.h" -#include "plgDispatch.h" #include "MaxMain/plPhysicalProps.h" #include "plNotetrackAnim.h" @@ -104,9 +112,6 @@ enum kClikDragEnabled, }; - -#include "plNoteTrackDlgComp.h" - class plClickDragComponentProc : public ParamMap2UserDlgProc { protected: diff --git a/Sources/Tools/MaxComponent/plClickableComponent.cpp b/Sources/Tools/MaxComponent/plClickableComponent.cpp index ffe179a0..d17f5a04 100644 --- a/Sources/Tools/MaxComponent/plClickableComponent.cpp +++ b/Sources/Tools/MaxComponent/plClickableComponent.cpp @@ -39,15 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plClickableComponent.h" -#include "resource.h" +#include "hsResMgr.h" + #include "plComponentReg.h" +#include "plActivatorBaseComponent.h" +#include "plResponderComponent.h" +#include "MaxMain/plMaxNode.h" + +#include "resource.h" +#pragma hdrstop + +#include "plClickableComponent.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" @@ -60,14 +68,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #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 "plResponderComponent.h" - #include "MaxMain/plPhysicalProps.h" diff --git a/Sources/Tools/MaxComponent/plClickableComponent.h b/Sources/Tools/MaxComponent/plClickableComponent.h index 254e5cf0..ee249c34 100644 --- a/Sources/Tools/MaxComponent/plClickableComponent.h +++ b/Sources/Tools/MaxComponent/plClickableComponent.h @@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClickableComponent_inc #define plClickableComponent_inc -#include "plActivatorBaseComponent.h" - #define CLICKABLE_CID Class_ID(0x1a5f6892, 0x7b434188) class plClickableComponent : public plActivatorBaseComponent diff --git a/Sources/Tools/MaxComponent/plClimbComponent.cpp b/Sources/Tools/MaxComponent/plClimbComponent.cpp index 444ba4c8..68c3c156 100644 --- a/Sources/Tools/MaxComponent/plClimbComponent.cpp +++ b/Sources/Tools/MaxComponent/plClimbComponent.cpp @@ -39,26 +39,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -// max includes -#include "plPickNode.h" + +#include "plComponent.h" +#include "plComponentReg.h" +#include "plPhysicalComponents.h" +#include "MaxMain/plMaxNode.h" + +#include +#include + #include "resource.h" +#pragma hdrstop + +#include "plPickNode.h" // local #include "plClimbComponent.h" -#include "plPhysicalComponents.h" // so we can pick terrains -#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" -// stl -#include ///////////////////////////////////////////////////////////////// // diff --git a/Sources/Tools/MaxComponent/plClimbComponent.h b/Sources/Tools/MaxComponent/plClimbComponent.h index 9109e058..ca52d69c 100644 --- a/Sources/Tools/MaxComponent/plClimbComponent.h +++ b/Sources/Tools/MaxComponent/plClimbComponent.h @@ -42,7 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_CLIMB_COMPONENT_H #define PL_CLIMB_COMPONENT_H -#include "plComponent.h" +class plErrorMsg; +class plMaxNode; class plClimbTriggerComponent : public plComponent { diff --git a/Sources/Tools/MaxComponent/plClothingComponent.cpp b/Sources/Tools/MaxComponent/plClothingComponent.cpp index c04ed8d1..a9d30419 100644 --- a/Sources/Tools/MaxComponent/plClothingComponent.cpp +++ b/Sources/Tools/MaxComponent/plClothingComponent.cpp @@ -39,17 +39,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" -// +#include "hsResMgr.h" #include "hsTemplates.h" + +#include "plComponent.h" +#include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" + +#include +#include "resource.h" +#pragma hdrstop + #include "plResMgr/plKeyFinder.h" #include "plResMgr/plPageInfo.h" -#include "hsResMgr.h" -#include "MaxMain/plMaxNode.h" + #include "plClothingComponent.h" -#include "plComponentReg.h" + #include "MaxPlasmaMtls/Materials/plClothingMtl.h" #include "pnMessage/plRefMsg.h" #include "plAvatar/plAvatarClothing.h" diff --git a/Sources/Tools/MaxComponent/plClothingComponent.h b/Sources/Tools/MaxComponent/plClothingComponent.h index e656ec98..d7613d05 100644 --- a/Sources/Tools/MaxComponent/plClothingComponent.h +++ b/Sources/Tools/MaxComponent/plClothingComponent.h @@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_CLOTHING_COMPONENT_H #define PL_CLOTHING_COMPONENT_H -#include "plComponent.h" - class plClothingComponent : public plComponent { public: diff --git a/Sources/Tools/MaxComponent/plClusterComponent.cpp b/Sources/Tools/MaxComponent/plClusterComponent.cpp index dd6d1022..d2952b50 100644 --- a/Sources/Tools/MaxComponent/plClusterComponent.cpp +++ b/Sources/Tools/MaxComponent/plClusterComponent.cpp @@ -39,23 +39,30 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" +#include "HeadSpin.h" +#include "hsBitVector.h" -#include "max.h" -#include "meshdlib.h" -#include "dummy.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "MaxMain/plPlasmaRefMsgs.h" - -#include "MaxExport/plExportProgressBar.h" +#include "plMiscComponents.h" #include "MaxMain/plMaxNode.h" -#include "HeadSpin.h" +#include +#include +#include + +#if MAX_VERSION_MAJOR >= 13 +# include +#endif + +#include "resource.h" +#include +#pragma hdrstop + +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxExport/plExportProgressBar.h" -#include "hsBitVector.h" #include "plMath/hsRadixSort.h" #include "pnEncryption/plRandom.h" #include "pfAnimation/plBlower.h" @@ -64,21 +71,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDistribComponent.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 - -#if MAX_VERSION_MAJOR >= 13 -#include -#endif - ///////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////// // Start with the component bookkeeping song and dance. diff --git a/Sources/Tools/MaxComponent/plComponentBase.cpp b/Sources/Tools/MaxComponent/plComponentBase.cpp index 0202b285..e0ba8151 100644 --- a/Sources/Tools/MaxComponent/plComponentBase.cpp +++ b/Sources/Tools/MaxComponent/plComponentBase.cpp @@ -39,12 +39,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" + #include "plComponentBase.h" #include "plComponentReg.h" -#include "MaxMain/plPlasmaRefMsgs.h" #include "MaxMain/plMaxNodeBase.h" +#include +#include +#pragma hdrstop + +#include "MaxMain/plPlasmaRefMsgs.h" #include "plAutoUIComp.h" plComponentBase::plComponentBase() : fClassDesc(nil), fCompPB(nil), fTargsPB(nil) @@ -579,8 +585,6 @@ int plSharedComponents(INodeTab& nodes, INodeTab& components) /////////////////////////////////////////////////////////////////////////////////////////// -#include "notify.h" - static void UpdateComponentVisibility(plMaxNodeBase *node) { plComponentBase *comp = node->ConvertToComponent(); diff --git a/Sources/Tools/MaxComponent/plComponentBase.h b/Sources/Tools/MaxComponent/plComponentBase.h index 45af7da1..841faed7 100644 --- a/Sources/Tools/MaxComponent/plComponentBase.h +++ b/Sources/Tools/MaxComponent/plComponentBase.h @@ -42,13 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_COMPONENT_BASE_H #define PL_COMPONENT_BASE_H -#include "HeadSpin.h" -#include "Max.h" -#include "iparamb2.h" -#include "iparamm2.h" - -#include "HeadSpin.h" #include "pnKeyedObject/plKey.h" +#include "hsWindows.h" + +#include +#include extern TCHAR *GetString(int id); extern HINSTANCE hInstance; @@ -56,10 +54,24 @@ extern HINSTANCE hInstance; #define COMPONENT_CLASSID Class_ID(0x758e5142, 0x66c748a) #define EXT_COMPONENT_CLASSID Class_ID(0x6c277b63, 0x6c626b3f) -class plMaxNodeBase; +class plAGAnim; +class Animatable; +class Box3; +class ClassDesc2; +class Class_ID; +class HelperObject; class plKey; class plMaxNode; -class plAGAnim; +class plMaxNodeBase; +class INode; +class INodeTab; +class IObjParam; +class ObjectState; +enum IOResult; +class IParamBlock2; +enum RefResult; +class RemapDir; +class ViewExp; class plComponentBase : public HelperObject { diff --git a/Sources/Tools/MaxComponent/plComponentMgr.cpp b/Sources/Tools/MaxComponent/plComponentMgr.cpp index f337aad0..6e32c8b9 100644 --- a/Sources/Tools/MaxComponent/plComponentMgr.cpp +++ b/Sources/Tools/MaxComponent/plComponentMgr.cpp @@ -39,15 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "max.h" -#include "iparamb2.h" +#include "HeadSpin.h" #include #include "plComponent.h" #include "plComponentMgr.h" #include "plComponentReg.h" +#pragma hdrstop ///////// class ComponentMgrClassDesc : public ClassDesc diff --git a/Sources/Tools/MaxComponent/plComponentMgr.h b/Sources/Tools/MaxComponent/plComponentMgr.h index 69dcccdf..0c1e14a6 100644 --- a/Sources/Tools/MaxComponent/plComponentMgr.h +++ b/Sources/Tools/MaxComponent/plComponentMgr.h @@ -42,14 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_COMPONENTMGR_H #define PL_COMPONENTMGR_H -#include "HeadSpin.h" -#include "max.h" -#include "utilapi.h" - +#include "hsWindows.h" #include -class ClassDesc2; -class Class_ID; +#include +#include +#include #define COMPONENT_MGR_CID Class_ID(0x5b870ba2, 0xb7b1da2) @@ -61,10 +59,6 @@ class Class_ID; // // 8/28/01: Added globals -Colin // -class hsResMgr; -class plFactory; -class plTimerCallbackManager; -class plTimerShare; class plComponentMgr : public UtilityObj { diff --git a/Sources/Tools/MaxComponent/plComponentProcBase.h b/Sources/Tools/MaxComponent/plComponentProcBase.h index d7b19a18..589b83b5 100644 --- a/Sources/Tools/MaxComponent/plComponentProcBase.h +++ b/Sources/Tools/MaxComponent/plComponentProcBase.h @@ -44,11 +44,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #pragma warning(disable: 4786) -#include "Max.h" -#include "iparamm2.h" #include #include +#include "hsWindows.h" +#include + // // Const Char* [] Version // diff --git a/Sources/Tools/MaxComponent/plComponentTools.cpp b/Sources/Tools/MaxComponent/plComponentTools.cpp index bc166c95..d9b11a11 100644 --- a/Sources/Tools/MaxComponent/plComponentTools.cpp +++ b/Sources/Tools/MaxComponent/plComponentTools.cpp @@ -39,11 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "max.h" -#include "pnModifier/plModifier.h" #include "plComponentTools.h" +#include "pnKeyedObject/plUoid.h" plKey plComponentTools::AddModifier(plMaxNodeBase *node, plModifier *mod) { diff --git a/Sources/Tools/MaxComponent/plComponentTools.h b/Sources/Tools/MaxComponent/plComponentTools.h index 9e076d1b..55cd9a33 100644 --- a/Sources/Tools/MaxComponent/plComponentTools.h +++ b/Sources/Tools/MaxComponent/plComponentTools.h @@ -42,17 +42,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_COMPONENT_TOOLS_H #define PL_COMPONENT_TOOLS_H -#include "HeadSpin.h" #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" -class INode; -class plModifier; +class plComponentBase; class plKey; class plLocation; -class plResponderModifier; -class plComponentBase; +class plModifier; class plMaxNodeBase; +class Mtl; +class INode; +class plResponderModifier; typedef plKey (*PAddModFunc) (plMaxNodeBase *, plModifier *); typedef plKey (*PGetNewKeyFunc) (const plString&, plModifier*, plLocation); diff --git a/Sources/Tools/MaxComponent/plDicer.cpp b/Sources/Tools/MaxComponent/plDicer.cpp index ef2f8d00..0bb6dee2 100644 --- a/Sources/Tools/MaxComponent/plDicer.cpp +++ b/Sources/Tools/MaxComponent/plDicer.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsWindows.h" -#include "max.h" -#include "meshdlib.h" +#include +#include +#pragma hdrstop #include "plDicer.h" diff --git a/Sources/Tools/MaxComponent/plDistribComponent.cpp b/Sources/Tools/MaxComponent/plDistribComponent.cpp index 3103544f..de762d83 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent.cpp +++ b/Sources/Tools/MaxComponent/plDistribComponent.cpp @@ -39,28 +39,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plComponent.h" +#include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include #include +#include +#include +#include -#include "max.h" -#include "meshdlib.h" -#include "stdmat.h" -#include "bmmlib.h" #include "resource.h" -#include "plComponent.h" -#include "plComponentReg.h" +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNode.h" #include "MaxExport/plExportProgressBar.h" #include "MaxExport/plExportErrorMsg.h" #include "MaxPlasmaMtls/Layers/plLayerTex.h" -#include "HeadSpin.h" - #include "MaxConvert/plDistributor.h" #include "MaxConvert/plDistTree.h" diff --git a/Sources/Tools/MaxComponent/plDistribComponent_old.cpp b/Sources/Tools/MaxComponent/plDistribComponent_old.cpp index f10d113e..fb3c2aaf 100644 --- a/Sources/Tools/MaxComponent/plDistribComponent_old.cpp +++ b/Sources/Tools/MaxComponent/plDistribComponent_old.cpp @@ -39,27 +39,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plComponent.h" +#include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include #include +#include +#include +#include -#include "max.h" -#include "meshdlib.h" -#include "stdmat.h" -#include "bmmlib.h" #include "resource.h" -#include "plComponent.h" -#include "plComponentReg.h" +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNode.h" #include "MaxExport/plExportProgressBar.h" #include "MaxPlasmaMtls/Layers/plLayerTex.h" -#include "HeadSpin.h" - #include "MaxConvert/plDistributor.h" #include "MaxConvert/plDistTree.h" // FISH HACK - just testing diff --git a/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp b/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp index b91d2b9e..8c1847a6 100644 --- a/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp +++ b/Sources/Tools/MaxComponent/plExcludeRegionComponent.cpp @@ -39,15 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plExcludeRegionComponent.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" #include "MaxMain/plMaxNode.h" -#include "pnKeyedObject/plKey.h" + +#include + +#include "resource.h" +#pragma hdrstop + +#include "plExcludeRegionComponent.h" #include "plModifier/plExcludeRegionModifier.h" #include "plPhysical/plSimDefs.h" diff --git a/Sources/Tools/MaxComponent/plFootPrintComponent.cpp b/Sources/Tools/MaxComponent/plFootPrintComponent.cpp index 5f791f3d..659c5fd4 100644 --- a/Sources/Tools/MaxComponent/plFootPrintComponent.cpp +++ b/Sources/Tools/MaxComponent/plFootPrintComponent.cpp @@ -39,24 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" +#include "HeadSpin.h" +#include "hsResMgr.h" +#include "plTweak.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" + +#include +#include "resource.h" +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" #include "plPickNode.h" -#include "MaxMain/plMaxNode.h" #include "MaxExport/plExportProgressBar.h" #include "MaxConvert/hsMaterialConverter.h" -#include "HeadSpin.h" -#include "plTweak.h" - -#include "hsResMgr.h" #include "pnMessage/plNodeRefMsg.h" #include "pnMessage/plObjRefMsg.h" diff --git a/Sources/Tools/MaxComponent/plFootstepComponent.cpp b/Sources/Tools/MaxComponent/plFootstepComponent.cpp index 745a0d71..0fcdd4ea 100644 --- a/Sources/Tools/MaxComponent/plFootstepComponent.cpp +++ b/Sources/Tools/MaxComponent/plFootstepComponent.cpp @@ -39,17 +39,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" +#include "hsResMgr.h" + +#include "plComponentReg.h" +#include "plAudioComponents.h" +#include "MaxMain/plMaxNode.h" #include "resource.h" + +#include #include -#include "hsResMgr.h" +#pragma hdrstop + #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" diff --git a/Sources/Tools/MaxComponent/plGUIComponents.cpp b/Sources/Tools/MaxComponent/plGUIComponents.cpp index 196694d6..d536c633 100644 --- a/Sources/Tools/MaxComponent/plGUIComponents.cpp +++ b/Sources/Tools/MaxComponent/plGUIComponents.cpp @@ -39,20 +39,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" +#include "plgDispatch.h" +#include "hsFiles.h" #include "hsTemplates.h" + #include "plComponent.h" #include "plComponentReg.h" -#include "plMiscComponents.h" #include "plAnimComponent.h" +#include "plAudioComponents.h" +#include "plMiscComponents.h" +#include "resource.h" +#include "MaxMain/plMaxNode.h" + +#include +#include +#include +#pragma hdrstop + #include "plNotetrackAnim.h" #include "plGUIComponents.h" -#include "plAudioComponents.h" - #include "MaxMain/plPlasmaRefMsgs.h" #include "pnSceneObject/plSceneObject.h" @@ -72,7 +81,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxMain/plPluginResManager.h" -#include "plgDispatch.h" #include "pnMessage/plObjRefMsg.h" #include "pnMessage/plIntRefMsg.h" #include "pnMessage/plNodeRefMsg.h" @@ -85,8 +93,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #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" @@ -115,7 +121,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeDescription/plAgeDescription.h" #include "MaxMain/plMaxCFGFile.h" #include "MaxMain/plAgeDescInterface.h" -#include "hsFiles.h" #include "MaxConvert/plConvert.h" #include "MaxPlasmaMtls/Layers/plDynamicTextLayer.h" #include "MaxPlasmaMtls/Layers/plLayerTexBitmapPB.h" @@ -135,9 +140,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPickLocalizationDlg.h" -#include -#include - void DummyCodeIncludeFuncGUI() {} diff --git a/Sources/Tools/MaxComponent/plGUIComponents.h b/Sources/Tools/MaxComponent/plGUIComponents.h index 8ae78f44..9e6a1998 100644 --- a/Sources/Tools/MaxComponent/plGUIComponents.h +++ b/Sources/Tools/MaxComponent/plGUIComponents.h @@ -48,10 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plGUIComponents_h #define _plGUIComponents_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 a09b573a..556dea91 100644 --- a/Sources/Tools/MaxComponent/plGrassComponent.cpp +++ b/Sources/Tools/MaxComponent/plGrassComponent.cpp @@ -39,21 +39,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include #include "HeadSpin.h" -#include "max.h" -#include "resource.h" -#include "hsTemplates.h" -#include "hsResMgr.h" #include "plQuality.h" +#include "hsResMgr.h" +#include "hsTemplates.h" + +#include "plComponent.h" +#include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#include +#pragma hdrstop + #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 "plSurface/plGrassShaderMod.h" diff --git a/Sources/Tools/MaxComponent/plIgnoreComponent.cpp b/Sources/Tools/MaxComponent/plIgnoreComponent.cpp index 6f7ca0c6..735912d9 100644 --- a/Sources/Tools/MaxComponent/plIgnoreComponent.cpp +++ b/Sources/Tools/MaxComponent/plIgnoreComponent.cpp @@ -39,16 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" -#include "plMiscComponents.h" #include "plComponentReg.h" +#include "plMiscComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNode.h" #include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" diff --git a/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp b/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp deleted file mode 100644 index aac5a9a7..00000000 --- a/Sources/Tools/MaxComponent/plImpactGadgetComponent.cpp +++ /dev/null @@ -1,196 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#include "HeadSpin.h" -#include "plImpactGadgetComponent.h" -#include "resource.h" -//#include "plComponent.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 "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 "plResponderComponent.h" - -#include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies -#include "plPhysicalComponents.h" -#include "pnMessage/plIntRefMsg.h" // Ibid -#include "plComponentProcBase.h" - -#include "MaxMain/plPhysicalProps.h" - -void DummyCodeIncludeFuncImpactGadget() {} - -// enum -// { -// kImpactObject_DEAD, -// kImpactOneShot, -// kUseImpactNode_DEAD, -// kImpactNode_DEAD, -// kImpactBoundsType_DEAD, -// kImpactBounceChoice_DEAD, -// kImpactBounceBoolTab_DEAD, -// kImpactReportChoice_DEAD, -// kImpactReportBoolTab_DEAD, -// kImpactEnabled, -// kImpactBounceGroups_DEAD, -// kImpactReportGroups, -// kImpactUseVelocity_DEAD, -// kImpactVelocity_DEAD, -// }; -// -// #include "plEventGroupUI.h" - -// static plEventGroupProc gReportGroupProc(kImpactReportGroups, "Report collisions with these groups", false); - -OBSOLETE_CLASS(plImpactGadget, gImpactGadgetDesc, "Collision Sensor", "CollisionSensor", COMP_TYPE_DETECTOR, IMPACTGADGET_CID) - -// enum -// { -// kImpactMain, -// kImpactBounce_DEAD, -// kImpactReport, -// }; -// -// ParamBlockDesc2 gImpactGadgetBlock -// ( -// plComponent::kBlkComp, _T("ImpactGadgetComp"), 0, &gImpactGadgetDesc, P_AUTO_CONSTRUCT + P_AUTO_UI + P_MULTIMAP, plComponent::kRefComp, -// -// 2, -// kImpactMain, IDD_COMP_DETECTOR_COLLISION, IDS_COMP_DETECTOR_COLLISION, 0, 0, NULL, -// kImpactReport, IDD_COMP_PHYS_CORE_GROUP, IDS_COMP_PHYS_REPORT, 0, APPENDROLL_CLOSED, &gReportGroupProc, -// -// kImpactOneShot, _T("oneshot"), TYPE_BOOL, 0, 0, -// p_ui, kImpactMain, TYPE_SINGLECHEKBOX, IDC_ONESHOT, -// end, -// -// kImpactReportGroups, _T("reportGroups"), TYPE_INT, 0,0, -// end, -// -// kImpactEnabled, _T("enabled"), TYPE_BOOL, 0, 0, -// p_ui, kImpactMain, TYPE_SINGLECHEKBOX, IDC_ENABLED, -// p_default, TRUE, -// end, -// -// end -// ); -// -// -// plImpactGadget::plImpactGadget() -// { -// fClassDesc = &gImpactGadgetDesc; -// fClassDesc->MakeAutoParamBlocks(this); -// } -// -// bool plImpactGadget::SetupProperties(plMaxNode *node, plErrorMsg *pErrMsg) -// { -// plActivatorBaseComponent::SetupProperties(node, pErrMsg); -// -// plPhysicalProps *physProps = node->GetPhysicalProps(); -// physProps->SetReportGroup(plEventGroupProc::GetGroups(fCompPB, kImpactReportGroups), node, pErrMsg); -// -// return true; -// } -// -// bool plImpactGadget::Convert(plMaxNode *node, plErrorMsg *pErrMsg) -// { -// plLocation loc = node->GetLocation(); -// plSceneObject *obj = node->GetSceneObject(); -// -// plKey logicKey = fLogicModKeys[node]; -// plLogicModifier *logic = plLogicModifier::ConvertNoRef(logicKey->GetObjectPtr()); -// -// if (fCompPB->GetInt(kImpactOneShot)) -// logic->SetFlag(plLogicModBase::kOneShot); -// -// hsTArray receivers; -// IGetReceivers(node, receivers); -// for (int i = 0; i < receivers.Count(); i++) -// logic->AddNotifyReceiver(receivers[i]); -// -// // Get the physical node (where the mod is going to be put) -// plMaxNode* physNode = node->GetPhysicalProps()->GetProxyNode(); -// if (!physNode) -// physNode = node; -// -// // Create remote detector -// plCollisionDetector* det = new plCollisionDetector; -// det->SetType(plCollisionDetector::kTypeBump); -// -// // Register the detector -// plKey detKey = hsgResMgr::ResMgr()->NewKey(IGetUniqueName(node), det, loc); -// hsgResMgr::ResMgr()->AddViaNotify(detKey, new plObjRefMsg(physNode->GetSceneObject()->GetKey(), plRefMsg::kOnCreate, -1, plObjRefMsg::kModifier), plRefFlags::kActiveRef); -// -// // create and register the CONDITIONS for the DETECTOR's Logic Modifier -// plActivatorConditionalObject* activatorCond = new plActivatorConditionalObject; -// plKey activatorKey = hsgResMgr::ResMgr()->NewKey(IGetUniqueName(node), activatorCond, loc); -// -// // link everything up: -// logic->AddCondition(activatorCond); // add this activator condition -// logic->SetDisabled(fCompPB->GetInt(kImpactEnabled) == 0); -// -// // Set up the remote detector (if any) -// activatorCond->SetActivatorKey(detKey); -// det->AddLogicObj(logicKey); -// -// // If this is for the SceneViewer, set the local only flag since the read function will never be called -// if (plConvert::Instance().IsForSceneViewer()) -// logic->SetLocalOnly(true); -// -// return true; -// } diff --git a/Sources/Tools/MaxComponent/plImpactGadgetComponent.h b/Sources/Tools/MaxComponent/plImpactGadgetComponent.h deleted file mode 100644 index 1b30d0dc..00000000 --- a/Sources/Tools/MaxComponent/plImpactGadgetComponent.h +++ /dev/null @@ -1,58 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#ifndef plImpactGadgetComponent_inc -#define plImpactGadgetComponent_inc - -#include "plActivatorBaseComponent.h" - -#define IMPACTGADGET_CID Class_ID(0x6cb343d6, 0x36995c82) - -// class plImpactGadget : public plActivatorBaseComponent -// { -// public: -// plImpactGadget(); -// -// bool SetupProperties(plMaxNode *node, plErrorMsg *pErrMsg); -// bool Convert(plMaxNode *node, plErrorMsg *pErrMsg); -// }; - -#endif // plImpactGadgetComponent_inc \ No newline at end of file diff --git a/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp b/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp index 0fce9fb8..84bb8a55 100644 --- a/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp +++ b/Sources/Tools/MaxComponent/plInventoryObjComponent.cpp @@ -39,19 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plInventoryObjComponent.h" //Inventory Dependencies +#include "hsResMgr.h" -#include "resource.h" //Resource Dependencies -#include "hsResMgr.h" // Ibid - -#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 "plComponent.h" +#include "plComponentReg.h" +#include "plActivatorBaseComponent.h" #include "plResponderComponent.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + +#include "plInventoryObjComponent.h" + +#include "pnSceneObject/plSceneObject.h" // Ibid +#include "pnKeyedObject/hsKeyedObject.h" // Ibid #include "plPhysical/plCollisionDetector.h" //Modifiers Dependencies #include "plModifier/plLogicModifier.h" // Ibid diff --git a/Sources/Tools/MaxComponent/plInventoryObjComponent.h b/Sources/Tools/MaxComponent/plInventoryObjComponent.h index 1638d068..12810a3f 100644 --- a/Sources/Tools/MaxComponent/plInventoryObjComponent.h +++ b/Sources/Tools/MaxComponent/plInventoryObjComponent.h @@ -42,13 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInventoryObjComponent_inc #define plInventoryObjComponent_inc - - #include "plClickableComponent.h" -#include "hsTemplates.h" -#include -#include "pnKeyedObject/plKey.h" +class plErrorMsg; +class plKey; class plMaxNode; #define INVENTORYOBJCOMP_CID Class_ID(0x425e1687, 0x4a126b91) diff --git a/Sources/Tools/MaxComponent/plLODFadeComponent.cpp b/Sources/Tools/MaxComponent/plLODFadeComponent.cpp index eacdee65..3e8b7f7e 100644 --- a/Sources/Tools/MaxComponent/plLODFadeComponent.cpp +++ b/Sources/Tools/MaxComponent/plLODFadeComponent.cpp @@ -39,19 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNode.h" #include "MaxExport/plExportProgressBar.h" -#include "HeadSpin.h" - #include "plLODFadeComponent.h" #include "pfSurface/plFadeOpacityMod.h" diff --git a/Sources/Tools/MaxComponent/plLightGrpComponent.cpp b/Sources/Tools/MaxComponent/plLightGrpComponent.cpp index 8f14823b..31e1bcf3 100644 --- a/Sources/Tools/MaxComponent/plLightGrpComponent.cpp +++ b/Sources/Tools/MaxComponent/plLightGrpComponent.cpp @@ -39,26 +39,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" +#include "hsResMgr.h" + #include "plComponent.h" #include "plComponentReg.h" - -#include "MaxMain/plPlasmaRefMsgs.h" #include "MaxMain/plMaxNode.h" -#include "hsResMgr.h" +#include "resource.h" +#pragma hdrstop +#include "MaxMain/plPlasmaRefMsgs.h" // LightGroup component +#include "plLightGrpComponent.h" #include "pnSceneObject/plSceneObject.h" #include "plGLight/plLightInfo.h" #include "plDrawable/plDrawableSpans.h" #include "pnSceneObject/plDrawInterface.h" #include "MaxPlasmaLights/plRealTimeLightBase.h" -#include "plLightGrpComponent.h" - ///////////////////////////////////////////////////////////////////////////////////////////////// // // LightGroup Component diff --git a/Sources/Tools/MaxComponent/plLightMapComponent.cpp b/Sources/Tools/MaxComponent/plLightMapComponent.cpp index 355f13bc..3f580154 100644 --- a/Sources/Tools/MaxComponent/plLightMapComponent.cpp +++ b/Sources/Tools/MaxComponent/plLightMapComponent.cpp @@ -39,19 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsColorRGBA.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - -#include "MaxMain/plPlasmaRefMsgs.h" #include "MaxMain/plMaxNode.h" -#include "hsResMgr.h" +#include "resource.h" +#pragma hdrstop +#include "MaxMain/plPlasmaRefMsgs.h" #include "plDrawable/plGeometrySpan.h" - #include "plLightMapComponent.h" void DummyCodeIncludeFuncLightMap() diff --git a/Sources/Tools/MaxComponent/plLightMapComponent.h b/Sources/Tools/MaxComponent/plLightMapComponent.h index ceae4165..323bef9f 100644 --- a/Sources/Tools/MaxComponent/plLightMapComponent.h +++ b/Sources/Tools/MaxComponent/plLightMapComponent.h @@ -43,10 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightMapComponent_inc #define plLightMapComponent_inc -#include "plComponent.h" - -#include "hsColorRGBA.h" - +struct hsColorRGBA; +class plKey; class plMipmap; const Class_ID LIGHTMAP_COMP_CID(0x1b1d0317, 0x3b3821db); diff --git a/Sources/Tools/MaxComponent/plLineFollowComp.cpp b/Sources/Tools/MaxComponent/plLineFollowComp.cpp index fe3b30d1..d94bd24f 100644 --- a/Sources/Tools/MaxComponent/plLineFollowComp.cpp +++ b/Sources/Tools/MaxComponent/plLineFollowComp.cpp @@ -39,22 +39,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" +#include "plgDispatch.h" + #include "plComponent.h" #include "plComponentReg.h" - #include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + #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 "plgDispatch.h" #include "MaxMain/plPluginResManager.h" #include "pnSceneObject/plSceneObject.h" diff --git a/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp b/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp index 64f9a450..1139e564 100644 --- a/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp +++ b/Sources/Tools/MaxComponent/plMaxAnimUtils.cpp @@ -39,12 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "Max.h" -#include "notetrck.h" #include "HeadSpin.h" #include "hsTemplates.h" +#include "hsWindows.h" + +#include +#include +#include +#pragma hdrstop #include "plMaxAnimUtils.h" #include "MaxExport/plErrorMsg.h" diff --git a/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp b/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp index c72cff0d..f2046203 100644 --- a/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp +++ b/Sources/Tools/MaxComponent/plMaxWaveUtils.cpp @@ -39,10 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" + #include "plMaxWaveUtils.h" #include "plAudioCore/plWavFile.h" -#include "HeadSpin.h" SegmentMap *GetWaveSegmentMap(const char *file, plErrorMsg *pErrMsg) { diff --git a/Sources/Tools/MaxComponent/plMiscComponents.cpp b/Sources/Tools/MaxComponent/plMiscComponents.cpp index 4a494477..5e29a478 100644 --- a/Sources/Tools/MaxComponent/plMiscComponents.cpp +++ b/Sources/Tools/MaxComponent/plMiscComponents.cpp @@ -39,17 +39,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" -#include "plMiscComponents.h" +#include "plCreatableIndex.h" +#include "plgDispatch.h" +#include "plFileUtils.h" +#include "hsFiles.h" + #include "plComponentReg.h" +#include "plMiscComponents.h" +#include "MaxMain/plMaxNode.h" +#include "MaxMain/plMaxNodeData.h" +#include "resource.h" + +#include +#include +#pragma hdrstop + #ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/MaxAssInterface.h" +# include "../../AssetMan/PublicInterface/MaxAssInterface.h" #endif #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNodeData.h" #include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" @@ -57,20 +68,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxMain/plPluginResManager.h" - -#include "plgDispatch.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 "plFileUtils.h" // Follow mod #include "plInterp/plAnimPath.h" @@ -95,7 +100,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeDescription/plAgeDescription.h" #include "MaxMain/plMaxCFGFile.h" #include "MaxMain/plAgeDescInterface.h" -#include "hsFiles.h" #include "plResMgr/plPageInfo.h" #include "plDrawable/plGeometrySpan.h" @@ -108,6 +112,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxConvert/plLayerConverter.h" #include "plGImage/plBitmap.h" +// NetSync +#include "pnNetCommon/plSDLTypes.h" +#include "MaxConvert/hsMaterialConverter.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" + void DummyCodeIncludeFuncMisc() { RegisterNotification(plPageInfoComponent::NotifyProc, nil, NOTIFY_FILE_POST_OPEN); @@ -2029,12 +2039,6 @@ bool plReferencePointComponent::SetupProperties(plMaxNode *pNode, plErrorMsg *pE // // -#include "pnNetCommon/plSDLTypes.h" -#include "MaxConvert/hsMaterialConverter.h" -#include "plSurface/hsGMaterial.h" -#include "plSurface/plLayerInterface.h" -#include "plCreatableIndex.h" - class plNetSyncComponent : public plComponent { protected: diff --git a/Sources/Tools/MaxComponent/plMiscComponents.h b/Sources/Tools/MaxComponent/plMiscComponents.h index 44ddb189..7fb4a5eb 100644 --- a/Sources/Tools/MaxComponent/plMiscComponents.h +++ b/Sources/Tools/MaxComponent/plMiscComponents.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plMiscComponents_inc #include "plComponent.h" -#include "Notify.h" #define ROOM_CID Class_ID(0x70a1570d, 0x472f5647) #define PAGEINFO_CID Class_ID(0x54ee40f1, 0x4de45acc) @@ -53,8 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define CIRCLE_CAM_CID Class_ID(0x66f85282, 0x4daa1b8e) #define IMAGE_LIB_CID Class_ID(0x736c18d3, 0x6a6d5dde) -class plComponentBase; class plAgeDescription; +class plComponentBase; +struct NotifyInfo; const char* LocCompGetPage(plComponentBase* comp); diff --git a/Sources/Tools/MaxComponent/plMorphSeqComp.cpp b/Sources/Tools/MaxComponent/plMorphSeqComp.cpp index 1cb9a637..9f016415 100644 --- a/Sources/Tools/MaxComponent/plMorphSeqComp.cpp +++ b/Sources/Tools/MaxComponent/plMorphSeqComp.cpp @@ -39,21 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" #include "plPickNode.h" -#include "MaxMain/plMaxNode.h" #include "MaxExport/plExportProgressBar.h" -#include "HeadSpin.h" -#include "hsResMgr.h" - #include "pnSceneObject/plSceneObject.h" #include "plDrawable/plMorphSequence.h" #include "plDrawable/plSharedMesh.h" diff --git a/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp b/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp index 61624d5d..29483a79 100644 --- a/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp +++ b/Sources/Tools/MaxComponent/plMultistageBehComponent.cpp @@ -39,23 +39,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plMultistageBehComponent.h" +#include "hsResMgr.h" +#include "hsStream.h" + +#include + #include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" +#pragma hdrstop + +#include "plMultistageBehComponent.h" #include "plMultistageStage.h" -#include "hsStream.h" -#include "resource.h" -#include "MaxMain/plMaxNode.h" #include "MaxMain/plMaxAccelerators.h" #include "plAvatar/plAnimStage.h" #include "plAvatar/plMultistageBehMod.h" -#include "hsResMgr.h" - -#include void DummyCodeIncludeFuncMultistageBeh() {} diff --git a/Sources/Tools/MaxComponent/plMultistageBehComponent.h b/Sources/Tools/MaxComponent/plMultistageBehComponent.h index 38b42f27..9c8aa68c 100644 --- a/Sources/Tools/MaxComponent/plMultistageBehComponent.h +++ b/Sources/Tools/MaxComponent/plMultistageBehComponent.h @@ -41,9 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #define MULTISTAGE_BEH_CID Class_ID(0x6c5234ab, 0x6c955a61) - -#include "max.h" - class plKey; class plComponentBase; class plMaxNodeBase; diff --git a/Sources/Tools/MaxComponent/plMultistageStage.cpp b/Sources/Tools/MaxComponent/plMultistageStage.cpp index 23693c79..b00b3d22 100644 --- a/Sources/Tools/MaxComponent/plMultistageStage.cpp +++ b/Sources/Tools/MaxComponent/plMultistageStage.cpp @@ -39,13 +39,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plMultistageStage.h" -#include "max.h" #include "hsStream.h" -#include "resource.h" +#include "hsWindows.h" +#include +#include +#include "resource.h" +#pragma hdrstop + +#include "plMultistageStage.h" #include "plAvatar/plAnimStage.h" plBaseStage::plBaseStage() diff --git a/Sources/Tools/MaxComponent/plMultistageStage.h b/Sources/Tools/MaxComponent/plMultistageStage.h index 8ab5a0d4..5c921b90 100644 --- a/Sources/Tools/MaxComponent/plMultistageStage.h +++ b/Sources/Tools/MaxComponent/plMultistageStage.h @@ -39,11 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" - -class hsStream; class plAnimStage; +class plBaseStage; +class hsStream; enum StageTypes { diff --git a/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp b/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp index 72b0c27e..b4d642a5 100644 --- a/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp +++ b/Sources/Tools/MaxComponent/plNPCSpawnComp.cpp @@ -39,23 +39,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plNPCSpawnComp.h" +#include -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - #include "plActivatorBaseComponent.h" - #include "MaxMain/plMaxNode.h" +#include "resource.h" +#pragma hdrstop +#include "plNPCSpawnComp.h" #include "plAvatar/plNPCSpawnMod.h" #include "pnMessage/plNotifyMsg.h" -#include - // Keep from getting dead-code-stripped void DummyCodeIncludFuncNPCSpawn() {} diff --git a/Sources/Tools/MaxComponent/plNPCSpawnComp.h b/Sources/Tools/MaxComponent/plNPCSpawnComp.h index eafccf26..169611a7 100644 --- a/Sources/Tools/MaxComponent/plNPCSpawnComp.h +++ b/Sources/Tools/MaxComponent/plNPCSpawnComp.h @@ -39,10 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "pnKeyedObject/plKey.h" class plComponentBase; +class plKey; class plMaxNodeBase; #define NPC_SPAWN_CLASS_ID Class_ID(0x784e3345, 0x2ed0288c) diff --git a/Sources/Tools/MaxComponent/plNavigableComponents.cpp b/Sources/Tools/MaxComponent/plNavigableComponents.cpp index 8fb21060..a886b585 100644 --- a/Sources/Tools/MaxComponent/plNavigableComponents.cpp +++ b/Sources/Tools/MaxComponent/plNavigableComponents.cpp @@ -39,21 +39,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "max.h" -#include "resource.h" // Resource Dependencies -#include "MaxMain/plPhysicalProps.h" +#include "HeadSpin.h" +#include "plgDispatch.h" +#include "hsTemplates.h" -#include "plComponent.h" //Component Dependencies -#include "plComponentReg.h" // Ibid -#include "MaxMain/plMaxNode.h" // Ibid -#include "pnKeyedObject/plKey.h" // Ibid +#include "plActivatorBaseComponent.h" +#include "plComponent.h" #include "plComponentProcBase.h" +#include "plComponentReg.h" +#include "plPhysicalComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" +#pragma hdrstop #include "plNavigableComponents.h" -#include "plActivatorBaseComponent.h" -#include "plPhysicalComponents.h" +#include "MaxMain/plPhysicalProps.h" #include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies #include "MaxConvert/hsControlConverter.h" // Ibid @@ -61,7 +62,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #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 diff --git a/Sources/Tools/MaxComponent/plNavigableComponents.h b/Sources/Tools/MaxComponent/plNavigableComponents.h index 12b79ab5..8eb8b8cb 100644 --- a/Sources/Tools/MaxComponent/plNavigableComponents.h +++ b/Sources/Tools/MaxComponent/plNavigableComponents.h @@ -42,11 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvLadderComponent_h_inc #define plAvLadderComponent_h_inc -#include "plComponent.h" -#include "pnKeyedObject/plKey.h" - -class plComponentBase; - +class plComponent; +class plErrorMsg; +class plKey; +class plMaxNode; +class INodeTab; +template class hsTArray; #define NAV_LADDER_CID Class_ID(0x6b010148, 0x47cc7464) diff --git a/Sources/Tools/MaxComponent/plNoteTrackDlgComp.cpp b/Sources/Tools/MaxComponent/plNoteTrackDlgComp.cpp index edeba120..292e2d87 100644 --- a/Sources/Tools/MaxComponent/plNoteTrackDlgComp.cpp +++ b/Sources/Tools/MaxComponent/plNoteTrackDlgComp.cpp @@ -39,9 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plNoteTrackDlgComp.h" + #include "plComponentBase.h" +#include "plNoteTrackDlgComp.h" +#pragma hdrstop + void plComponentNoteTrackDlg::ICacheNoteTrack() { diff --git a/Sources/Tools/MaxComponent/plNotetrackAnim.cpp b/Sources/Tools/MaxComponent/plNotetrackAnim.cpp index 6aa6159c..11cb494f 100644 --- a/Sources/Tools/MaxComponent/plNotetrackAnim.cpp +++ b/Sources/Tools/MaxComponent/plNotetrackAnim.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plNotetrackAnim.h" + #include "plComponentBase.h" #include "MaxMain/plMaxNodeBase.h" +#pragma hdrstop + +#include "plNotetrackAnim.h" plNotetrackAnim::plNotetrackAnim() : fSegMap(nil) { diff --git a/Sources/Tools/MaxComponent/plNotetrackDlg.cpp b/Sources/Tools/MaxComponent/plNotetrackDlg.cpp index 2bd77f41..5d04bb42 100644 --- a/Sources/Tools/MaxComponent/plNotetrackDlg.cpp +++ b/Sources/Tools/MaxComponent/plNotetrackDlg.cpp @@ -39,12 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsWindows.h" + +#include +#include +#pragma hdrstop + #include "plNoteTrackDlg.h" #include "plNotetrackAnim.h" -#include "max.h" -#include "iparamb2.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/plNotetrackDlg.h b/Sources/Tools/MaxComponent/plNotetrackDlg.h index 0f1c60b8..c401e928 100644 --- a/Sources/Tools/MaxComponent/plNotetrackDlg.h +++ b/Sources/Tools/MaxComponent/plNotetrackDlg.h @@ -42,12 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLNOTETRACKDLG_INC #define PLNOTETRACKDLG_INC -#include "HeadSpin.h" - // For HWND #include "plMaxAnimUtils.h" -class IParamBlock2; class Animatable; +class IParamBlock2; class plNoteTrackDlg { diff --git a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp index ab8de2a4..9677f0c1 100644 --- a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp +++ b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp @@ -39,11 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" + #include "plComponent.h" #include "plComponentReg.h" +#include "resource.h" + +#include +#pragma hdrstop + #include "pnEncryption/plRandom.h" #include "plObjectFlockerComponent.h" #include "pnKeyedObject/plUoid.h" diff --git a/Sources/Tools/MaxComponent/plOneShotComponent.cpp b/Sources/Tools/MaxComponent/plOneShotComponent.cpp index 7bd87c29..8e583b5c 100644 --- a/Sources/Tools/MaxComponent/plOneShotComponent.cpp +++ b/Sources/Tools/MaxComponent/plOneShotComponent.cpp @@ -40,49 +40,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plOneShotComponent.h" +#include "hsResMgr.h" + +#include -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - #include "MaxMain/plMaxNode.h" -#if 0 -#include "MaxConvert/hsConverterUtils.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 "plResMgr/plLoc.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" -#endif +#include "resource.h" +#pragma hdrstop -#include "hsResMgr.h" +#include "plOneShotComponent.h" #include "plAvatar/plOneShotMod.h" -#include - void DummyCodeIncludeFuncSingleSht() {} @@ -93,7 +63,7 @@ void DummyCodeIncludeFuncSingleSht() {} // enum { - kAnimName, // Insert in v1 + kOneShotAnimName, // Insert in v1 kStartPtBool_DEAD, // Insert in v1 // obsolete kStartPt_DEAD, // Insert in v1 // obsolete kTriggerVolBool, // Insert in v1 @@ -161,7 +131,7 @@ ParamBlockDesc2 gOneShotBlock IDD_COMP_ONESHOT, IDS_COMP_ONESHOTS, 0, 0, NULL, //params - kAnimName, _T("AnimationName"), TYPE_STRING, 0, 0, + kOneShotAnimName, _T("AnimationName"), TYPE_STRING, 0, 0, p_ui, TYPE_EDITBOX, IDC_COMP_ONESHOT_ANIM_TEXTBOX, end, @@ -210,7 +180,7 @@ plKey plOneShotComponent::GetOneShotKey(plMaxNode *node) bool plOneShotComponent::IsValid() { - const char *animName = fCompPB->GetStr(kAnimName); + const char *animName = fCompPB->GetStr(kOneShotAnimName); return (animName && *animName != '\0'); } @@ -255,7 +225,7 @@ bool plOneShotComponent::Convert(plMaxNode* node, plErrorMsg *pErrMsg) { if (fMods.find(node) != fMods.end()) { - const char *animName = fCompPB->GetStr(kAnimName); + const char *animName = fCompPB->GetStr(kOneShotAnimName); bool drivable = fCompPB->GetInt(kControlSpeedBool); bool reversable = fCompPB->GetInt(kPlayBackwardsBool); float seekDuration = fCompPB->GetFloat(kSeekTimeFloat); diff --git a/Sources/Tools/MaxComponent/plOneShotComponent.h b/Sources/Tools/MaxComponent/plOneShotComponent.h index c4507c46..9e3c02f1 100644 --- a/Sources/Tools/MaxComponent/plOneShotComponent.h +++ b/Sources/Tools/MaxComponent/plOneShotComponent.h @@ -39,10 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "pnKeyedObject/plKey.h" class plComponentBase; +class plKey; class plMaxNodeBase; #define ONESHOTCLASS_ID Class_ID(0x1efd285a, 0x11ba00a2) diff --git a/Sources/Tools/MaxComponent/plParticleComponents.cpp b/Sources/Tools/MaxComponent/plParticleComponents.cpp index 1142151b..e8d35403 100644 --- a/Sources/Tools/MaxComponent/plParticleComponents.cpp +++ b/Sources/Tools/MaxComponent/plParticleComponents.cpp @@ -39,33 +39,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include +#include "plgDispatch.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "plParticleComponents.h" #include "plAnimComponent.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#include +#pragma hdrstop + + +#include "plParticleComponents.h" #include "plNotetrackAnim.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 "MaxExport/plErrorMsg.h" -#include "hsResMgr.h" - #include "pnMessage/plObjRefMsg.h" #include "pnMessage/plNodeRefMsg.h" #include "plInterp/plController.h" diff --git a/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp b/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp index 6ef45eb2..a724bb70 100644 --- a/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysConstraintComponents.cpp @@ -39,14 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -void DummyCodeIncludeFuncPhysConst() -{ -} +#include "hsWindows.h" -#include "HeadSpin.h" #include "plComponent.h" #include "plComponentReg.h" +#pragma hdrstop + +void DummyCodeIncludeFuncPhysConst() +{ +} + #define PHYS_CONST_HINGE_CID Class_ID(0x790b1637, 0x32c94144) #define PHYS_CONST_WHEEL_CID Class_ID(0x6e2958dc, 0x62e86e87) #define PHYS_CONST_SS_CID Class_ID(0x14843886, 0x62a24e94) diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp index 7ac147c2..6c232cbc 100644 --- a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp @@ -39,24 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -// singular -#include "plPhysicalComponents.h" +#include "HeadSpin.h" +#include "hsResMgr.h" -// local #include "plComponentReg.h" +#include "MaxMain/plPhysicalProps.h" +#include "MaxMain/plMaxNode.h" #include "resource.h" -// global -#include "hsResMgr.h" +#include +#pragma hdrstop + +// singular +#include "plPhysicalComponents.h" // other #include "plPhysical/plSimDefs.h" #include "plPhysicsGroups.h" -#include "MaxMain/plMaxNode.h" -#include "MaxMain/plPhysicalProps.h" #include "MaxMain/plPlasmaRefMsgs.h" #include "plPhysical/plCollisionDetector.h" diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.h b/Sources/Tools/MaxComponent/plPhysicalComponents.h index b760c517..3868e3f2 100644 --- a/Sources/Tools/MaxComponent/plPhysicalComponents.h +++ b/Sources/Tools/MaxComponent/plPhysicalComponents.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalComponents_h_inc #define plPhysicalComponents_h_inc -#include "max.h" //Max Dependencies #include "plComponent.h" #define PHYSICS_BASE_CID Class_ID(0x610f187a, 0x25824341) diff --git a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp index feb739f3..259ee36c 100644 --- a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp +++ b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp @@ -39,18 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plPickLocalizationDlg.h" -#include "pfLocalizationMgr/pfLocalizationDataMgr.h" - -#include "MaxMain/plMaxCFGFile.h" -#include "MaxMain/plMaxAccelerators.h" - +#include "HeadSpin.h" #include "hsStringTokenizer.h" +#include #include "resource.h" - #include +#pragma hdrstop + +#include "plPickLocalizationDlg.h" +#include "pfLocalizationMgr/pfLocalizationDataMgr.h" + +#include "MaxMain/plMaxCFGFile.h" +#include "MaxMain/plMaxAccelerators.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plPickLocalizationDlg.h b/Sources/Tools/MaxComponent/plPickLocalizationDlg.h index e20cfb34..4e30ec75 100644 --- a/Sources/Tools/MaxComponent/plPickLocalizationDlg.h +++ b/Sources/Tools/MaxComponent/plPickLocalizationDlg.h @@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickLocalizationDlg_h #define plPickLocalizationDlg_h -#include "HeadSpin.h" -#include "max.h" #include class plPickLocalizationDlg diff --git a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp index 7b5cfe26..a04716ac 100644 --- a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp +++ b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp @@ -39,15 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsThread.h" +#include "MaxMain/plMaxNode.h" + +#include +#pragma hdrstop + #include "plPickMaterialMap.h" -#include "max.h" -#include "MaxMain/plMaxNode.h" // MAXR4 HACK // Coming in the backdoor... -#include "hsThread.h" class hsHackWinFindThread : public hsThread { protected: diff --git a/Sources/Tools/MaxComponent/plPickMaterialMap.h b/Sources/Tools/MaxComponent/plPickMaterialMap.h index 926a20eb..99d3a5d1 100644 --- a/Sources/Tools/MaxComponent/plPickMaterialMap.h +++ b/Sources/Tools/MaxComponent/plPickMaterialMap.h @@ -39,17 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -class plMessage; -class IParamBlock2; -class ClassDesc2; -class plMaxNode; -class plErrorMsg; -class plComponentBase; -class Mtl; -class plMaxNodeBase; -template class hsTArray; -//int GetMatAnimModKey(Mtl* mtl, plMaxNodeBase* node, float begin, float end, hsTArray& keys); +class Mtl; +class IParamBlock2; namespace plPickMaterialMap { diff --git a/Sources/Tools/MaxComponent/plPickNode.cpp b/Sources/Tools/MaxComponent/plPickNode.cpp index 6ed24165..90890426 100644 --- a/Sources/Tools/MaxComponent/plPickNode.cpp +++ b/Sources/Tools/MaxComponent/plPickNode.cpp @@ -39,17 +39,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plPickNode.h" -#include "iparamb2.h" #include #include "plActivatorBaseComponent.h" -#include "plPythonFileComponent.h" #include "plBehavioralComponents.h" -#include "plNavigableComponents.h" #include "plPhysicalComponents.h" + +#include +#pragma hdrstop + +#include "plPickNode.h" + #include "plCameraComponents.h" +#include "plNavigableComponents.h" +#include "plPythonFileComponent.h" class plPickNodeMax : public HitByNameDlgCallback { diff --git a/Sources/Tools/MaxComponent/plPickNode.h b/Sources/Tools/MaxComponent/plPickNode.h index 870934ae..925a58f8 100644 --- a/Sources/Tools/MaxComponent/plPickNode.h +++ b/Sources/Tools/MaxComponent/plPickNode.h @@ -42,10 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickNode_h_inc #define plPickNode_h_inc -#include "max.h" #include +class Class_ID; class plComponentBase; +class IParamBlock2; namespace plPick { diff --git a/Sources/Tools/MaxComponent/plPickNodeBase.cpp b/Sources/Tools/MaxComponent/plPickNodeBase.cpp index 181f7c04..d18119b3 100644 --- a/Sources/Tools/MaxComponent/plPickNodeBase.cpp +++ b/Sources/Tools/MaxComponent/plPickNodeBase.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plPickNodeBase.h" +#include -#include "MaxMain/plMaxNode.h" #include "plComponentBase.h" +#include "MaxMain/plMaxNode.h" #include "resource.h" -#include "MaxMain/plMaxAccelerators.h" +#pragma hdrstop -#include +#include "plPickNodeBase.h" +#include "MaxMain/plMaxAccelerators.h" plPickNodeBase::plPickNodeBase(IParamBlock2* pb, int nodeParamID) : fPB(pb), fNodeParamID(nodeParamID) { diff --git a/Sources/Tools/MaxComponent/plPickNodeBase.h b/Sources/Tools/MaxComponent/plPickNodeBase.h index 46edc80c..4dc8f762 100644 --- a/Sources/Tools/MaxComponent/plPickNodeBase.h +++ b/Sources/Tools/MaxComponent/plPickNodeBase.h @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickNodeBase_h_inc #define plPickNodeBase_h_inc -#include "HeadSpin.h" -#include "max.h" #include -class IParamBlock2; -class plMaxNode; +class Class_ID; class plComponentBase; +class plMaxNode; +class Mtl; +class IParamBlock2; class plPickNodeBase { diff --git a/Sources/Tools/MaxComponent/plPickNodeComp.cpp b/Sources/Tools/MaxComponent/plPickNodeComp.cpp index 56df1438..905229ee 100644 --- a/Sources/Tools/MaxComponent/plPickNodeComp.cpp +++ b/Sources/Tools/MaxComponent/plPickNodeComp.cpp @@ -39,14 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plPickNodeBase.h" -#include "MaxMain/plMaxNode.h" +#include "HeadSpin.h" +#include + #include "plComponentBase.h" +#include "MaxMain/plMaxNode.h" #include "resource.h" -#include "MaxMain/plMaxAccelerators.h" +#pragma hdrstop -#include +#include "plPickNodeBase.h" +#include "MaxMain/plMaxAccelerators.h" plPickNodeBase::plPickNodeBase(IParamBlock2* pb, int nodeParamID) : fPB(pb), fNodeParamID(nodeParamID) { diff --git a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp index f66d5f98..3a42a811 100644 --- a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp +++ b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp @@ -39,13 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plPythonFileComponent.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "plActivatorBaseComponent.h" +#include "plAnimComponent.h" +#include "plPhysicalComponents.h" #include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#include +#include +#include +#include +#pragma hdrstop + +#include "plPythonFileComponent.h" #include "plAutoUIBlock.h" #include "plAutoUIParams.h" @@ -56,7 +68,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plGUIComponents.h" #include "pfGUISkinComp.h" #include "plExcludeRegionComponent.h" -#include "plAnimComponent.h" #include "plNotetrackAnim.h" #include "plOneShotComponent.h" #include "plMultistageBehComponent.h" @@ -66,25 +77,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawable/plWaveSetBase.h" #include "plClusterComponent.h" #include "plDrawable/plClusterGroup.h" -#include "plPhysicalComponents.h" //#include "plHavok1/plHKPhysical.h" #include "plAvatar/plSwimRegion.h" #include "plSurface/plGrassShaderMod.h" #include "plGrassComponent.h" -#include "notify.h" - -#include -#include -#include -#include - #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 "plResponderComponent.h" + //// plCommonPythonLib /////////////////////////////////////////////////////// // Derived class for our global python fileMods, since they go in to the // BuiltIn page @@ -403,10 +408,6 @@ bool plPythonFileComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg) return true; } -#include "plActivatorBaseComponent.h" -#include "pnKeyedObject/plKey.h" -#include "plResponderComponent.h" - bool plPythonFileComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg) { IParamBlock2 *pb = (IParamBlock2*)fCompPB->GetReferenceTarget(kPythonFilePB); diff --git a/Sources/Tools/MaxComponent/plPythonFileComponent.h b/Sources/Tools/MaxComponent/plPythonFileComponent.h index 6fed5329..bf2d1892 100644 --- a/Sources/Tools/MaxComponent/plPythonFileComponent.h +++ b/Sources/Tools/MaxComponent/plPythonFileComponent.h @@ -39,8 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -class plComponentClassDesc; + class plAutoUIBlock; +class plComponentClassDesc; #define PYTHON_FILE_CID Class_ID(0x670d3629, 0x559e4f11) diff --git a/Sources/Tools/MaxComponent/plRepComponent.cpp b/Sources/Tools/MaxComponent/plRepComponent.cpp index 13df6ad7..9073d625 100644 --- a/Sources/Tools/MaxComponent/plRepComponent.cpp +++ b/Sources/Tools/MaxComponent/plRepComponent.cpp @@ -39,22 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plLoadMask.h" +#include "hsResMgr.h" -#include "max.h" -#include "dummy.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" #include "plMiscComponents.h" - -#include "MaxMain/plPlasmaRefMsgs.h" #include "MaxMain/plMaxNode.h" -#include "MaxExport/plExportErrorMsg.h" +#include "resource.h" -#include "hsResMgr.h" +#include +#include +#pragma hdrstop -#include "plLoadMask.h" +#include "MaxMain/plPlasmaRefMsgs.h" +#include "MaxExport/plExportErrorMsg.h" #include "plPickNode.h" diff --git a/Sources/Tools/MaxComponent/plResponderAnim.cpp b/Sources/Tools/MaxComponent/plResponderAnim.cpp index be20aa8e..92b210c8 100644 --- a/Sources/Tools/MaxComponent/plResponderAnim.cpp +++ b/Sources/Tools/MaxComponent/plResponderAnim.cpp @@ -40,28 +40,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plResponderAnim.h" -#include "plResponderComponentPriv.h" -#include "resource.h" -#include "max.h" - -#include "MaxMain/plMaxNode.h" +#include "plAudible.h" #include "plAnimComponent.h" #include "plAudioComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" -#include "plMaxAnimUtils.h" +#include #include +#pragma hdrstop + +#include "plResponderAnim.h" +#include "plResponderComponentPriv.h" + +#include "plAnimCompProc.h" +#include "plPickNode.h" +#include "plResponderGetComp.h" + +#include "plMaxAnimUtils.h" // Needed for anim msg creation -#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 "plAudible.h" #include "pnMessage/plSoundMsg.h" #include "MaxMain/plPlasmaRefMsgs.h" @@ -529,10 +534,6 @@ void plResponderCmdAnim::CreateWait(plMaxNode* node, plErrorMsg* pErrMsg, IParam hsRefCnt_SafeUnRef(eventMsg); } -#include "plAnimCompProc.h" -#include "plPickNode.h" -#include "plResponderGetComp.h" - class plResponderAnimProc : public plAnimCompProc { public: diff --git a/Sources/Tools/MaxComponent/plResponderAnim.h b/Sources/Tools/MaxComponent/plResponderAnim.h index 714c15e6..b73b8441 100644 --- a/Sources/Tools/MaxComponent/plResponderAnim.h +++ b/Sources/Tools/MaxComponent/plResponderAnim.h @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "plResponderCmd.h" -#include "pnKeyedObject/plKey.h" class plComponentBase; +class plErrorMsg; +class plMaxNode; +class plMessage; +class IParamBlock2; class plResponderCmdAnim : public plResponderCmd { diff --git a/Sources/Tools/MaxComponent/plResponderCmd.h b/Sources/Tools/MaxComponent/plResponderCmd.h index 2cf6557f..b673fd98 100644 --- a/Sources/Tools/MaxComponent/plResponderCmd.h +++ b/Sources/Tools/MaxComponent/plResponderCmd.h @@ -46,11 +46,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pnKeyedObject/plKey.h" -class ParamBlockDesc2; -class IParamBlock2; -class plMessage; class plErrorMsg; class plMaxNode; +class plMessage; +class ParamBlockDesc2; +class IParamBlock2; +class plString; class ResponderWaitInfo { diff --git a/Sources/Tools/MaxComponent/plResponderComponent.cpp b/Sources/Tools/MaxComponent/plResponderComponent.cpp index 60fb170d..6629824e 100644 --- a/Sources/Tools/MaxComponent/plResponderComponent.cpp +++ b/Sources/Tools/MaxComponent/plResponderComponent.cpp @@ -40,8 +40,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plResponderComponentPriv.h" +#include "hsResMgr.h" +#include "hsStlSortUtils.h" +#include "hsWindows.h" + +#include +#include +#include + #include "resource.h" +#pragma hdrstop + +#include "plResponderComponentPriv.h" #include "plComponent.h" #include "plComponentReg.h" @@ -59,7 +69,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plObjRefMsg.h" #include "pnMessage/plNotifyMsg.h" -#include "hsResMgr.h" #include "MaxMain/plMaxNode.h" #include "plPickNode.h" @@ -584,8 +593,6 @@ void plResponderProc::IAddMenuItem(HMENU hMenu, int id) AppendMenu(hMenu, MF_STRING, id+1, fNames[id]); } -#include "hsSTLSortUtils.h" - void plResponderProc::ICreateMenu() { fhMenu = CreatePopupMenu(); diff --git a/Sources/Tools/MaxComponent/plResponderComponent.h b/Sources/Tools/MaxComponent/plResponderComponent.h index a55f4779..224d27ab 100644 --- a/Sources/Tools/MaxComponent/plResponderComponent.h +++ b/Sources/Tools/MaxComponent/plResponderComponent.h @@ -39,8 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#ifndef _plResponderComponent_h_inc_ +#define _plResponderComponent_h_inc_ + #include "plComponentExt.h" -#include "pnKeyedObject/plKey.h" + +class plKey; +class plMaxNodeBase; #define RESPONDER_CID Class_ID(0x46b83f3e, 0x7d5e5d17) @@ -62,3 +68,5 @@ namespace Responder // get the key to the responder modifier plKey GetKey(plComponentBase *comp, plMaxNodeBase *node); } + +#endif // _plResponderComponent_h_inc_ diff --git a/Sources/Tools/MaxComponent/plResponderComponentPriv.h b/Sources/Tools/MaxComponent/plResponderComponentPriv.h index 19f007c0..71bf544d 100644 --- a/Sources/Tools/MaxComponent/plResponderComponentPriv.h +++ b/Sources/Tools/MaxComponent/plResponderComponentPriv.h @@ -39,13 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -// Private header for the responder component. Anyone else should include plResponderComponent.h + +/* \file plResponderComponentPriv.h + * + * Private header for the responder component. Anyone else should include plResponderComponent.h + */ + #include "plResponderComponent.h" #include "plComponent.h" #include "pnKeyedObject/plKey.h" #include +class plErrorMsg; +class plMaxNode; + class plResponderComponent : public plComponent { public: diff --git a/Sources/Tools/MaxComponent/plResponderGetComp.cpp b/Sources/Tools/MaxComponent/plResponderGetComp.cpp index 609bad5a..826d7760 100644 --- a/Sources/Tools/MaxComponent/plResponderGetComp.cpp +++ b/Sources/Tools/MaxComponent/plResponderGetComp.cpp @@ -39,14 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "plResponderGetComp.h" +#include "HeadSpin.h" #include +#include "plComponentBase.h" #include "MaxMain/plMaxNodeBase.h" #include "resource.h" -#include "plComponentBase.h" +#pragma hdrstop + +#include "plResponderGetComp.h" #include "MaxMain/plMaxAccelerators.h" plResponderGetComp& plResponderGetComp::Instance() diff --git a/Sources/Tools/MaxComponent/plResponderGetComp.h b/Sources/Tools/MaxComponent/plResponderGetComp.h index 665c5ec9..9bcc5fca 100644 --- a/Sources/Tools/MaxComponent/plResponderGetComp.h +++ b/Sources/Tools/MaxComponent/plResponderGetComp.h @@ -39,15 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "max.h" #include #include +class Class_ID; class plComponentBase; -class IParamBlock2; class plMaxNodeBase; +class IParamBlock2; class plResponderGetComp { diff --git a/Sources/Tools/MaxComponent/plResponderLink.cpp b/Sources/Tools/MaxComponent/plResponderLink.cpp index 0ad774e1..f6f1b6e0 100644 --- a/Sources/Tools/MaxComponent/plResponderLink.cpp +++ b/Sources/Tools/MaxComponent/plResponderLink.cpp @@ -39,17 +39,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plResponderLink.h" -#include "plResponderComponentPriv.h" -#include "resource.h" -#include "max.h" -#include "MaxMain/plMaxNode.h" +#include "hsFiles.h" #include "hsResMgr.h" + +#include "plComponentBase.h" +#include "plActivatorBaseComponent.h" +#include "plCameraComponents.h" #include "plMiscComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + +#include "plResponderLink.h" +#include "plResponderComponentPriv.h" + // Needed for the dialog #include "MaxMain/plMaxCFGFile.h" -#include "hsFiles.h" #include "plAgeDescription/plAgeDescription.h" // Needed to create the message @@ -377,8 +386,6 @@ void plResponderLinkProc::ILoadParentAgeFilenamesCombo(HWND hWnd, IParamBlock2 * /////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////// -#include "plComponentBase.h" - // Needed for message creation #include "plModifier/plResponderModifier.h" #include "plResponderGetComp.h" @@ -725,7 +732,6 @@ plMessage *plResponderCmdNotify::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, /////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////// -#include "plCameraComponents.h" #include "plPickNode.h" enum { kActivatorComp, kActivatorEnable }; @@ -806,7 +812,6 @@ const char *plResponderCmdDetectorEnable::GetInstanceName(IParamBlock2 *pb) } #include "pnMessage/plEnableMsg.h" -#include "plActivatorBaseComponent.h" #include "plVolumeGadgetComponent.h" #include "plNavigableComponents.h" @@ -1089,7 +1094,6 @@ const char *plResponderCmdCamTransition::GetInstanceName(IParamBlock2 *pb) } #include "pnMessage/plCameraMsg.h" -#include "plCameraComponents.h" plMessage *plResponderCmdCamTransition::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb) { diff --git a/Sources/Tools/MaxComponent/plResponderLink.h b/Sources/Tools/MaxComponent/plResponderLink.h index 3402809f..04cf1bd7 100644 --- a/Sources/Tools/MaxComponent/plResponderLink.h +++ b/Sources/Tools/MaxComponent/plResponderLink.h @@ -39,10 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" + #include "plResponderCmd.h" #include "pnKeyedObject/plKey.h" +class plErrorMsg; +class plMaxNode; +class IParamBlock2; +class ParamBlockDesc2; + class plResponderCmdLink : public plResponderCmd { public: diff --git a/Sources/Tools/MaxComponent/plResponderMtl.cpp b/Sources/Tools/MaxComponent/plResponderMtl.cpp index 80162c53..dd47cb13 100644 --- a/Sources/Tools/MaxComponent/plResponderMtl.cpp +++ b/Sources/Tools/MaxComponent/plResponderMtl.cpp @@ -39,13 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plResponderMtl.h" -#include "plResponderComponentPriv.h" -#include "resource.h" -#include "max.h" + +#include +#include +#include #include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + +#include "plResponderMtl.h" +#include "plResponderComponentPriv.h" #include "MaxPlasmaMtls/Materials/plDecalMtl.h" #include "MaxPlasmaMtls/Materials/plPassMtl.h" @@ -65,10 +73,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Needed for convert #include "plMessage/plAnimCmdMsg.h" -#include -#include -#include - #include "MaxMain/plPlasmaRefMsgs.h" enum diff --git a/Sources/Tools/MaxComponent/plResponderMtl.h b/Sources/Tools/MaxComponent/plResponderMtl.h index a738f1a3..b238791b 100644 --- a/Sources/Tools/MaxComponent/plResponderMtl.h +++ b/Sources/Tools/MaxComponent/plResponderMtl.h @@ -42,15 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plResponderCmd.h" #include "pnKeyedObject/plKey.h" -class plMessage; -class IParamBlock2; -class ClassDesc2; -class plMaxNode; +template class hsTArray; class plErrorMsg; -class plComponentBase; -class Mtl; +class plMaxNode; class plMaxNodeBase; -template class hsTArray; +class plMessage; +class Mtl; +class IParamBlock2; +class plString; int GetMatAnimModKey(Mtl* mtl, plMaxNodeBase* node, const plString &segName, hsTArray& keys); diff --git a/Sources/Tools/MaxComponent/plResponderWait.cpp b/Sources/Tools/MaxComponent/plResponderWait.cpp index b4cb0edc..d720c221 100644 --- a/Sources/Tools/MaxComponent/plResponderWait.cpp +++ b/Sources/Tools/MaxComponent/plResponderWait.cpp @@ -40,11 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include "hsWindows.h" + +#include "MaxMain/MaxCompat.h" +#include +#include "resource.h" +#pragma hdrstop + #include "plResponderWait.h" #include "plResponderComponentPriv.h" -#include "resource.h" #include "plModifier/plResponderModifier.h" -#include "MaxMain/MaxCompat.h" #include "plResponderLink.h" diff --git a/Sources/Tools/MaxComponent/plResponderWait.h b/Sources/Tools/MaxComponent/plResponderWait.h index 2af33065..754efff9 100644 --- a/Sources/Tools/MaxComponent/plResponderWait.h +++ b/Sources/Tools/MaxComponent/plResponderWait.h @@ -39,12 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ - // Damn, had to pass in a HWND + #include + class ClassDesc2; -class IParamBlock2; class plKey; class plMessage; +class IParamBlock2; class plResponderModifier; class plString; diff --git a/Sources/Tools/MaxComponent/plSeekPoint.cpp b/Sources/Tools/MaxComponent/plSeekPoint.cpp index b61980be..0dce69cb 100644 --- a/Sources/Tools/MaxComponent/plSeekPoint.cpp +++ b/Sources/Tools/MaxComponent/plSeekPoint.cpp @@ -39,26 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include +#include "hsGeometry3.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - #include "MaxMain/plMaxNode.h" +#include "resource.h" -#include "pnSceneObject/plSceneObject.h" +#include +#pragma hdrstop -#include "hsResMgr.h" +#include "pnSceneObject/plSceneObject.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" diff --git a/Sources/Tools/MaxComponent/plShadowComponents.cpp b/Sources/Tools/MaxComponent/plShadowComponents.cpp index 58900ea6..06a71408 100644 --- a/Sources/Tools/MaxComponent/plShadowComponents.cpp +++ b/Sources/Tools/MaxComponent/plShadowComponents.cpp @@ -39,17 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - #include "MaxMain/plMaxNode.h" -#include "MaxExport/plExportProgressBar.h" +#include "resource.h" -#include "HeadSpin.h" +#include +#pragma hdrstop + +#include "MaxExport/plExportProgressBar.h" #include "plShadowComponents.h" @@ -61,8 +63,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plGLight/plPointShadowMaster.h" #include "plGLight/plDirectShadowMaster.h" -#include "hsResMgr.h" - void DummyCodeIncludeFuncShadow() { } diff --git a/Sources/Tools/MaxComponent/plShadowComponents.h b/Sources/Tools/MaxComponent/plShadowComponents.h index 540aeb44..88669386 100644 --- a/Sources/Tools/MaxComponent/plShadowComponents.h +++ b/Sources/Tools/MaxComponent/plShadowComponents.h @@ -47,10 +47,10 @@ const Class_ID SHADOWCAST_COMP_CID(0x4f447666, 0x73a07cc6); const Class_ID SHADOWRCV_COMP_CID(0x1d3009ca, 0x4d28537f); const Class_ID SHADOWLIGHT_COMP_CID(0x2a996151, 0x4f4d1ae1); -class plMaxNode; +class plDirectShadowMaster; class plErrorMsg; +class plMaxNode; class plPointShadowMaster; -class plDirectShadowMaster; class plShadowCaster; class plShadowCastComponent : public plComponent diff --git a/Sources/Tools/MaxComponent/plSmoothComponent.cpp b/Sources/Tools/MaxComponent/plSmoothComponent.cpp index d528f84c..28488da2 100644 --- a/Sources/Tools/MaxComponent/plSmoothComponent.cpp +++ b/Sources/Tools/MaxComponent/plSmoothComponent.cpp @@ -39,16 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" - #include "MaxMain/plMaxNode.h" +#include "resource.h" -#include "HeadSpin.h" +#include +#pragma hdrstop #include "plDrawable/plDrawableSpans.h" diff --git a/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp b/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp index af9e600c..9d84d947 100644 --- a/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp +++ b/Sources/Tools/MaxComponent/plSoftVolumeComponent.cpp @@ -39,24 +39,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "dummy.h" -#include "resource.h" +#include "hsTemplates.h" +#include "hsResMgr.h" + #include "plComponent.h" #include "plComponentReg.h" #include "plMiscComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#include +#pragma hdrstop + #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 "hsResMgr.h" #include "plGLight/plLightInfo.h" #include "plScene/plOccluder.h" diff --git a/Sources/Tools/MaxComponent/plSoftVolumeComponent.h b/Sources/Tools/MaxComponent/plSoftVolumeComponent.h index a8276ea0..5e31edf4 100644 --- a/Sources/Tools/MaxComponent/plSoftVolumeComponent.h +++ b/Sources/Tools/MaxComponent/plSoftVolumeComponent.h @@ -42,8 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plSoftVolumeComponent_h #define _plSoftVolumeComponent_h -#include "pnKeyedObject/plKey.h" -#include "hsTemplates.h" #include "pnKeyedObject/plUoid.h" ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxComponent/plTemplateComponent.cpp b/Sources/Tools/MaxComponent/plTemplateComponent.cpp index 2b33ebdd..fbef4c91 100644 --- a/Sources/Tools/MaxComponent/plTemplateComponent.cpp +++ b/Sources/Tools/MaxComponent/plTemplateComponent.cpp @@ -39,19 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsTemplates.h" + #include "plComponent.h" #include "plComponentReg.h" - -#include "hsTemplates.h" -#include "MaxMain/plPluginResManager.h" +#include "plMiscComponents.h" #include "MaxMain/plMaxNode.h" -#include "pnSceneObject/plSceneObject.h" -#include "pnKeyedObject/plKey.h" +#include "resource.h" +#pragma hdrstop -#include "plMiscComponents.h" -#include "resource.h" + +#include "MaxMain/plPluginResManager.h" +#include "pnSceneObject/plSceneObject.h" void DummyCodeIncludeFuncTemplate() { diff --git a/Sources/Tools/MaxComponent/plTypesComponents.cpp b/Sources/Tools/MaxComponent/plTypesComponents.cpp index f17dd99c..b7b45390 100644 --- a/Sources/Tools/MaxComponent/plTypesComponents.cpp +++ b/Sources/Tools/MaxComponent/plTypesComponents.cpp @@ -39,29 +39,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include +#include "plgDispatch.h" +#include "hsGeometry3.h" +#include "hsResMgr.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "pnSceneObject/plSceneObject.h" +#include "plAnimComponent.h" +#include "plAudioComponents.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" -#include "pfCamera/plInterestingModifier.h" -#include "plModifier/plSpawnModifier.h" -#include "plgDispatch.h" +#include +#include +#pragma hdrstop +#include "pnSceneObject/plSceneObject.h" -#include "hsResMgr.h" +#include "pfCamera/plInterestingModifier.h" +#include "plModifier/plSpawnModifier.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 "pnSceneObject/plCoordinateInterface.h" @@ -481,8 +485,6 @@ bool plMaintainersMarkerComponent::PreConvert(plMaxNode *pNode, plErrorMsg *pErr #include "MaxMain/plMtlCollector.h" #include "plResponderMtl.h" #include "plResponderGetComp.h" -#include "plAnimComponent.h" -#include "plAudioComponents.h" class plGameMarkerComponent : public plComponent { diff --git a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp index a4f60023..6c81a3f9 100644 --- a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp +++ b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.cpp @@ -39,14 +39,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plVolumeGadgetComponent.h" -#include "resource.h" +#include "hsResMgr.h" + +#include "plComponentProcBase.h" #include "plComponentReg.h" +#include "plActivatorBaseComponent.h" +#include "plPhysicalComponents.h" +#include "plResponderComponent.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + +#include "plVolumeGadgetComponent.h" #include "pnSceneObject/plSceneObject.h" #include "pnKeyedObject/hsKeyedObject.h" -#include "pnKeyedObject/plKey.h" #include "plPhysical/plCollisionDetector.h" // MM #include "plModifier/plLogicModifier.h" @@ -59,17 +70,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plNotifyMsg.h" #include "pnMessage/plCursorChangeMsg.h" -#include "hsResMgr.h" -#include "MaxMain/plMaxNode.h" #include "MaxConvert/plConvert.h" -#include "plResponderComponent.h" - // Physics Dependencies below #include "MaxConvert/hsConverterUtils.h" //Conversion Dependencies -#include "plPhysicalComponents.h" #include "pnMessage/plIntRefMsg.h" -#include "plComponentProcBase.h" #include "MaxMain/plPhysicalProps.h" diff --git a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h index 9dd45a18..f77eea73 100644 --- a/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h +++ b/Sources/Tools/MaxComponent/plVolumeGadgetComponent.h @@ -42,9 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVolumeGadgetComponent_inc #define plVolumeGadgetComponent_inc -#include "plActivatorBaseComponent.h" -#include "pnKeyedObject/plKey.h" - #define VOLUMEGADGET_CID Class_ID(0x1f77b56, 0x209a09d8) class plVolumeGadgetComponent : public plActivatorBaseComponent diff --git a/Sources/Tools/MaxComponent/plWaterComponent.cpp b/Sources/Tools/MaxComponent/plWaterComponent.cpp index f06780ed..237b5eea 100644 --- a/Sources/Tools/MaxComponent/plWaterComponent.cpp +++ b/Sources/Tools/MaxComponent/plWaterComponent.cpp @@ -39,24 +39,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plTweak.h" -#include "max.h" -#include "meshdlib.h" -#include "dummy.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" +#include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#include +#include +#pragma hdrstop + #include "MaxMain/plPlasmaRefMsgs.h" -#include "MaxMain/plMaxNode.h" +#include "plPickNode.h" #include "plWaterComponent.h" #include "plSoftVolumeComponent.h" -#include "HeadSpin.h" -#include "plTweak.h" - #include "plDrawable/plWaveSetBase.h" #include "plDrawable/plWaveSet7.h" #include "plDrawable/plFixedWaterState7.h" @@ -791,8 +794,6 @@ public: void DeleteThis() { } }; -#include "plPickNode.h" - BOOL plShoreCompSelProc::DlgProc(TimeValue t, IParamMap2 *paramMap, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) @@ -931,8 +932,6 @@ public: void DeleteThis() { } }; -#include "plPickNode.h" - BOOL plWDecalCompSelProc::DlgProc(TimeValue t, IParamMap2 *paramMap, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) diff --git a/Sources/Tools/MaxComponent/plXImposter.cpp b/Sources/Tools/MaxComponent/plXImposter.cpp index dfb70f98..626d210c 100644 --- a/Sources/Tools/MaxComponent/plXImposter.cpp +++ b/Sources/Tools/MaxComponent/plXImposter.cpp @@ -39,15 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plPhysical.h" -#include "max.h" -#include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "MaxMain/plPlasmaRefMsgs.h" - #include "MaxMain/plMaxNode.h" +#include "resource.h" + +#include +#pragma hdrstop + +#include "MaxMain/plPlasmaRefMsgs.h" #include "MaxExport/plExportProgressBar.h" #include "plXImposter.h" @@ -55,7 +59,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfAnimation/plFilterCoordInterface.h" #include "pnSceneObject/plSimulationInterface.h" -#include "plPhysical.h" const Class_ID FILTERINHERIT_COMP_CID(0x263928d8, 0x548456da); diff --git a/Sources/Tools/MaxMain/plMaxNode.h b/Sources/Tools/MaxMain/plMaxNode.h index 877fd5ad..98886eb8 100644 --- a/Sources/Tools/MaxMain/plMaxNode.h +++ b/Sources/Tools/MaxMain/plMaxNode.h @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsMatrix44.h" -#include "iparamb2.h" #include "pnKeyedObject/plKey.h" #include diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.h b/Sources/Tools/MaxMain/plMaxNodeBase.h index 2cb04a7b..b421316a 100644 --- a/Sources/Tools/MaxMain/plMaxNodeBase.h +++ b/Sources/Tools/MaxMain/plMaxNodeBase.h @@ -44,7 +44,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsTemplates.h" -#include "max.h" #include "hsMatrix44.h" #include "hsColorRGBA.h" #include "pnKeyedObject/plKey.h"