From 6e75026c469515719502c19c88f37a9dbd168f17 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 11 Dec 2012 01:50:45 -0500 Subject: [PATCH] Attempt to de-messify MaxMain ... Similarly to MaxComponent, I'm not sure how much this helps. But, it (should) compile. I hate 3dsm. --- Sources/Tools/MaxMain/CMakeLists.txt | 1 + Sources/Tools/MaxMain/GlobalUtility.cpp | 13 ++- Sources/Tools/MaxMain/GlobalUtility.h | 9 +- Sources/Tools/MaxMain/MaxAllocDll.cpp | 8 +- Sources/Tools/MaxMain/Pch.cpp | 51 +++++++++ Sources/Tools/MaxMain/Pch.h | 111 +++++++++++++++++++ Sources/Tools/MaxMain/indexes.cpp | 4 +- Sources/Tools/MaxMain/main.cpp | 36 +++--- Sources/Tools/MaxMain/plActionTableMgr.cpp | 7 ++ Sources/Tools/MaxMain/plActionTableMgr.h | 6 +- Sources/Tools/MaxMain/plAgeDescInterface.cpp | 31 ++++-- Sources/Tools/MaxMain/plAgeDescInterface.h | 20 +--- Sources/Tools/MaxMain/plCommonObjLib.cpp | 4 +- Sources/Tools/MaxMain/plCommonObjLib.h | 9 +- Sources/Tools/MaxMain/plComponentDlg.cpp | 18 +-- Sources/Tools/MaxMain/plComponentDlg.h | 7 +- Sources/Tools/MaxMain/plComponentPanel.cpp | 8 +- Sources/Tools/MaxMain/plComponentPanel.h | 8 +- Sources/Tools/MaxMain/plGetLocationDlg.cpp | 14 ++- Sources/Tools/MaxMain/plMaxAccelerators.cpp | 7 +- Sources/Tools/MaxMain/plMaxCFGFile.cpp | 8 +- Sources/Tools/MaxMain/plMaxMenu.cpp | 14 ++- Sources/Tools/MaxMain/plMaxMeshExtractor.cpp | 13 ++- Sources/Tools/MaxMain/plMaxMeshExtractor.h | 4 +- Sources/Tools/MaxMain/plMaxNode.cpp | 40 ++++--- Sources/Tools/MaxMain/plMaxNode.h | 47 ++++---- Sources/Tools/MaxMain/plMaxNodeBase.cpp | 31 +++--- Sources/Tools/MaxMain/plMaxNodeBase.h | 24 ++-- Sources/Tools/MaxMain/plMaxNodeData.h | 17 ++- Sources/Tools/MaxMain/plMaxUtils.cpp | 28 ++--- Sources/Tools/MaxMain/plMaxUtils.h | 6 +- Sources/Tools/MaxMain/plMtlCollector.cpp | 10 +- Sources/Tools/MaxMain/plMtlCollector.h | 9 +- Sources/Tools/MaxMain/plNodeLock.cpp | 5 +- Sources/Tools/MaxMain/plPhysXCooking.cpp | 26 +++-- Sources/Tools/MaxMain/plPhysXCooking.h | 11 +- Sources/Tools/MaxMain/plPhysicalProps.cpp | 6 +- Sources/Tools/MaxMain/plPhysicalProps.h | 5 +- Sources/Tools/MaxMain/plPluginResManager.cpp | 17 +-- Sources/Tools/MaxMain/plPluginResManager.h | 5 +- Sources/Tools/MaxMain/plPythonMgr.cpp | 27 +++-- Sources/Tools/MaxMain/plPythonMgr.h | 4 +- Sources/Tools/MaxMain/plResCollector.cpp | 9 +- Sources/Tools/MaxMain/plResetXform.cpp | 9 +- Sources/Tools/MaxMain/plResetXform.h | 5 +- Sources/Tools/MaxMain/plSaveSelected.cpp | 14 ++- Sources/Tools/MaxMain/plTextureExportLog.cpp | 7 +- Sources/Tools/MaxMain/plTextureSearch.cpp | 27 +++-- Sources/Tools/MaxMain/plTextureSearch.h | 1 - 49 files changed, 527 insertions(+), 274 deletions(-) create mode 100644 Sources/Tools/MaxMain/Pch.cpp create mode 100644 Sources/Tools/MaxMain/Pch.h diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index 2e53ed29..fea2d74a 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -81,6 +81,7 @@ set(MaxMain_SOURCES ) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Plasma_BINARY_DIR}/bin) +use_precompiled_header(Pch.h Pch.cpp MaxMain_HEADERS MaxMain_SOURCES) add_library(MaxMain SHARED ${MaxMain_HEADERS} ${MaxMain_RESOURCES} ${MaxMain_SOURCES}) set_target_properties(MaxMain PROPERTIES OUTPUT_NAME "PlasmaMax") set_target_properties(MaxMain PROPERTIES SUFFIX ".gup") diff --git a/Sources/Tools/MaxMain/GlobalUtility.cpp b/Sources/Tools/MaxMain/GlobalUtility.cpp index d6ab8045..9aa13c7b 100644 --- a/Sources/Tools/MaxMain/GlobalUtility.cpp +++ b/Sources/Tools/MaxMain/GlobalUtility.cpp @@ -39,17 +39,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" -#include "GlobalUtility.h" +#include "HeadSpin.h" #include "hsResMgr.h" + +#include "MaxComponent/plComponentBase.h" #include "plMaxNode.h" + +#include +#pragma hdrstop + +#include "GlobalUtility.h" + #include "MaxSceneViewer/SceneSync.h" #include "MaxComponent/ComponentDummies.h" #include "plActionTableMgr.h" #include "plMaxMenu.h" -#include "MaxComponent/plComponentBase.h" #include "MaxSceneViewer/plMaxFileData.h" #include "pfPython/cyPythonInterface.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" @@ -165,7 +171,6 @@ DWORD PlasmaMax::Start() DummyCodeIncludeFuncInventStuff(); //Inventory Object comp DummyCodeIncludeFuncVolumeGadget(); // inside/enter/exit phys volume activator // DummyCodeIncludeFuncActivatorGadget(); // activator activator - DummyCodeIncludeFuncImpactGadget(); // collision activator DummyCodeIncludeFuncSoftVolume(); // Soft Volumes DummyCodeIncludeFuncPhysConst(); // Phys Constraints DummyCodeIncludeFuncCameras(); // new camera code diff --git a/Sources/Tools/MaxMain/GlobalUtility.h b/Sources/Tools/MaxMain/GlobalUtility.h index 87f17a95..0f6abe9d 100644 --- a/Sources/Tools/MaxMain/GlobalUtility.h +++ b/Sources/Tools/MaxMain/GlobalUtility.h @@ -42,14 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA_MAX_H #define PLASMA_MAX_H +#include + class BitmapManager; +class ClassDesc; +class GUP; class Texmap; -#include "max.h" -#include "guplib.h" -#include "HeadSpin.h" -#include - #define PLASMA_MAX_CLASSID Class_ID(0x3d494269, 0x103c5c5f) extern ClassDesc* GetGUPDesc(); diff --git a/Sources/Tools/MaxMain/MaxAllocDll.cpp b/Sources/Tools/MaxMain/MaxAllocDll.cpp index 0802de51..69cc7f69 100644 --- a/Sources/Tools/MaxMain/MaxAllocDll.cpp +++ b/Sources/Tools/MaxMain/MaxAllocDll.cpp @@ -39,7 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" + +#include "HeadSpin.h" +#include "hsWindows.h" + +#include +#pragma hdrstop + #include "MaxAllocDll.h" typedef void* (*MAXMALLOC) (size_t size); diff --git a/Sources/Tools/MaxMain/Pch.cpp b/Sources/Tools/MaxMain/Pch.cpp new file mode 100644 index 00000000..e6aaece5 --- /dev/null +++ b/Sources/Tools/MaxMain/Pch.cpp @@ -0,0 +1,51 @@ +/*==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 "Pch.h" + +/** + * \file Pch.cpp + * \brief Precompiled Header object for MaxMain + * + * This file prompts MSVC to generate a PCH file for the MaxMain project. It + * has no function if precompiled headers are disabled in cmake. + */ diff --git a/Sources/Tools/MaxMain/Pch.h b/Sources/Tools/MaxMain/Pch.h new file mode 100644 index 00000000..b11de810 --- /dev/null +++ b/Sources/Tools/MaxMain/Pch.h @@ -0,0 +1,111 @@ +/*==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 _MaxMain_Pch_inc_ +#define _MaxMain_Pch_inc_ + +/** + * \file Pch.h + * \brief Precompiled Header for MaxMain + */ + +// STL +#include +#include +#include +#include +#include + +// Core Plasma +#include "HeadSpin.h" +#include "hsBitVector.h" +#include "hsColorRGBA.h" +#include "plgDispatch.h" +#include "hsFastMath.h" +#include "hsFiles.h" +#include "hsGeometry3.h" +#include "pnKeyedObject/plKey.h" +#include "plLoadMask.h" +#include "hsMatrix44.h" +#include "plRenderLevel.h" +#include "hsSTLStream.h" +#include "hsStream.h" +#include "hsStringTokenizer.h" +#include "hsTemplates.h" + +// Windows +#include "hsWindows.h" +#include +#include +#include + +// PlasmaMax Stuff included everywhere +// Some of these files may pull in Max SDK headers, so put this below hsWindows.h! +#include "plMaxNode.h" +#include "plMaxNodeData.h" +#include "MaxComponent/plComponent.h" +#include "MaxComponent/plComponentReg.h" + +// Misc Max SDK +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Utility +#include "MaxCompat.h" +#include "resource.h" + +// Python +#include + +#endif // _MaxMain_Pch_inc_ \ No newline at end of file diff --git a/Sources/Tools/MaxMain/indexes.cpp b/Sources/Tools/MaxMain/indexes.cpp index 4d085850..6b6b84f3 100644 --- a/Sources/Tools/MaxMain/indexes.cpp +++ b/Sources/Tools/MaxMain/indexes.cpp @@ -43,15 +43,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // rebuilt unless completely necessary -Colin #include "HeadSpin.h" +#pragma hdrstop + #include "pnNucleusCreatables.h" #include "plAllCreatables.h" -//#include "pfAllCreatables.h" #include "pfCharacter/pfCharacterCreatable.h" #include "pfCamera/pfCameraCreatable.h" #include "pfAnimation/pfAnimationCreatable.h" #include "pfConditional/plConditionalObjectCreatable.h" -//#include "pfConsole/pfConsoleCreatable.h" #include "pfSurface/pfSurfaceCreatable.h" #include "pfMessage/pfMessageCreatable.h" #include "pfAudio/pfAudioCreatable.h" diff --git a/Sources/Tools/MaxMain/main.cpp b/Sources/Tools/MaxMain/main.cpp index d435c367..c5ebc3b9 100644 --- a/Sources/Tools/MaxMain/main.cpp +++ b/Sources/Tools/MaxMain/main.cpp @@ -41,15 +41,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "Max.h" -#include "istdplug.h" -#include "custcont.h" +#include "hsFiles.h" +#include "hsTemplates.h" + +#include "MaxComponent/plComponentMgr.h" +#include "MaxCompat.h" + + +#include +#include +#include + +// "TEMP" -- who's gonna rewrite that now? >.< +#include +#include +#pragma hdrstop #include "MaxExport/SimpleExport.h" -#include "MaxMain/MaxCompat.h" -#include "MaxComponent/plComponentMgr.h" #include "MaxPlasmaMtls/plMtlImport.h" + +#include "plPythonMgr.h" +#include "plPluginResManager.h" +#include "plSDL/plSDL.h" +#include "plMaxCFGFile.h" + extern ClassDesc* GetGUPDesc(); extern ClassDesc* GetComponentUtilDesc(); extern ClassDesc* GetComponentMgrDesc(); @@ -133,13 +149,6 @@ __declspec(dllexport) ULONG LibVersion() return VERSION_3DSMAX; } -#include "plPythonMgr.h" -#include "plPluginResManager.h" -#include "plSDL/plSDL.h" -#include "plMaxCFGFile.h" -#include -#include "hsFiles.h" - // // DLLMAIN // @@ -191,9 +200,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) ////////////////////////////////////////////////////////////////////////////////// // TEMP ////////////////////////////////////////////////////////////////////////////////// -#include "CustAttrib.h" -#include "ICustAttribContainer.h" -#include "iparamb2.h" #define PL_GEN_ATTRIB_CLASS_ID Class_ID(0x24c36e6e, 0x53ec2ce4) diff --git a/Sources/Tools/MaxMain/plActionTableMgr.cpp b/Sources/Tools/MaxMain/plActionTableMgr.cpp index 15edb83d..50fc6a4b 100644 --- a/Sources/Tools/MaxMain/plActionTableMgr.cpp +++ b/Sources/Tools/MaxMain/plActionTableMgr.cpp @@ -46,6 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ******************************************************************************/ #include "HeadSpin.h" +#include "hsWindows.h" + +#include +#include +#include +#pragma hdrstop + #include "plActionTableMgr.h" diff --git a/Sources/Tools/MaxMain/plActionTableMgr.h b/Sources/Tools/MaxMain/plActionTableMgr.h index fc024073..4097c68b 100644 --- a/Sources/Tools/MaxMain/plActionTableMgr.h +++ b/Sources/Tools/MaxMain/plActionTableMgr.h @@ -48,10 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef __PLACTIONTABLEMGR_H #define __PLACTIONTABLEMGR_H -#include "HeadSpin.h" -#include "Max.h" -#include "notify.h" -#include +class ActionCallback; +struct ActionDescription; typedef bool(*ActionCallbackFunc)(int); diff --git a/Sources/Tools/MaxMain/plAgeDescInterface.cpp b/Sources/Tools/MaxMain/plAgeDescInterface.cpp index 54b1c03b..54fd40d8 100644 --- a/Sources/Tools/MaxMain/plAgeDescInterface.cpp +++ b/Sources/Tools/MaxMain/plAgeDescInterface.cpp @@ -40,20 +40,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plAgeDescInterface.h" -#include "max.h" -#include "resource.h" #include "hsFiles.h" +#include "hsStream.h" +#include "hsTemplates.h" +#include "hsWindows.h" + +#include +#include +#include + +#include "resource.h" +#pragma hdrstop + +#include "plAgeDescInterface.h" + #include "plAgeDescription/plAgeDescription.h" #include "plMaxCFGFile.h" -#include "hsStream.h" + #ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/MaxAssInterface.h" +# include "../../AssetMan/PublicInterface/MaxAssInterface.h" #endif #include "plMaxAccelerators.h" -#include using std::string; extern HINSTANCE hInstance; @@ -149,8 +158,10 @@ plAgeDescInterface::~plAgeDescInterface() DeleteObject( fHiliteBrush ); fBoldFont = nil; +#ifdef MAXASS_AVAILABLE delete fAssetManIface; fAssetManIface = nil; +#endif } plAgeDescInterface& plAgeDescInterface::Instance() @@ -828,7 +839,7 @@ bool plAgeDescInterface::IGetLocalAgePath(char *path) return true; } -int plAgeDescInterface::IFindAge(const char* ageName, vector& ageFiles) +int plAgeDescInterface::IFindAge(const char* ageName, std::vector& ageFiles) { for (int i = 0; i < ageFiles.size(); i++) if (ageFiles[i]->fAgeName == ageName) @@ -837,7 +848,7 @@ int plAgeDescInterface::IFindAge(const char* ageName, vector& ageFil return -1; } -void plAgeDescInterface::IGetAgeFiles(vector& ageFiles) +void plAgeDescInterface::IGetAgeFiles(std::vector& ageFiles) { IClearAgeFiles(ageFiles); @@ -894,7 +905,7 @@ void plAgeDescInterface::IGetAgeFiles(vector& ageFiles) #endif } -void plAgeDescInterface::IClearAgeFiles(vector& ageFiles) +void plAgeDescInterface::IClearAgeFiles(std::vector& ageFiles) { for (int i = 0; i < ageFiles.size(); i++) delete ageFiles[i]; @@ -903,7 +914,7 @@ void plAgeDescInterface::IClearAgeFiles(vector& ageFiles) void plAgeDescInterface::BuildAgeFileList( hsTArray &ageList ) { - vector tempAgeFiles; + std::vector tempAgeFiles; IGetAgeFiles(tempAgeFiles); for (int i = 0; i < tempAgeFiles.size(); i++) diff --git a/Sources/Tools/MaxMain/plAgeDescInterface.h b/Sources/Tools/MaxMain/plAgeDescInterface.h index 6d1e12ed..96a81126 100644 --- a/Sources/Tools/MaxMain/plAgeDescInterface.h +++ b/Sources/Tools/MaxMain/plAgeDescInterface.h @@ -40,20 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "HeadSpin.h" -#include "hsTemplates.h" -#include -#include - -using std::vector; - -class ISpinnerControl; class plAgeDescription; class plAgeFile; +class MaxAssBranchAccess; +class ISpinnerControl; typedef struct _TREEITEM *HTREEITEM; -class MaxAssBranchAccess; class plAgeDescInterface { protected: @@ -75,8 +68,7 @@ protected: HFONT fBoldFont; HBRUSH fHiliteBrush; - vector fAgeFiles; -// vector<_variant_t> fAssetIds; + std::vector fAgeFiles; MaxAssBranchAccess *fAssetManIface; @@ -95,9 +87,9 @@ public: static void BuildAgeFileList( hsTArray &ageList ); protected: - static int IFindAge(const char* ageName, vector& ageFiles); - static void IGetAgeFiles(vector& ageFiles); - static void IClearAgeFiles(vector& ageFiles); + static int IFindAge(const char* ageName, std::vector& ageFiles); + static void IGetAgeFiles(std::vector& ageFiles); + static void IClearAgeFiles(std::vector& ageFiles); void IResetParams(); diff --git a/Sources/Tools/MaxMain/plCommonObjLib.cpp b/Sources/Tools/MaxMain/plCommonObjLib.cpp index 92ca4b5d..834834ce 100644 --- a/Sources/Tools/MaxMain/plCommonObjLib.cpp +++ b/Sources/Tools/MaxMain/plCommonObjLib.cpp @@ -48,7 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "HeadSpin.h" +#include "hsTemplates.h" +#pragma hdrstop + #include "plCommonObjLib.h" #include "pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/plUoid.h" diff --git a/Sources/Tools/MaxMain/plCommonObjLib.h b/Sources/Tools/MaxMain/plCommonObjLib.h index 3fdad631..c1b9721c 100644 --- a/Sources/Tools/MaxMain/plCommonObjLib.h +++ b/Sources/Tools/MaxMain/plCommonObjLib.h @@ -65,16 +65,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plCommonObjLib_h #define _plCommonObjLib_h -#include "hsTemplates.h" - +class plCommonObjLibList; +class plKey; +class hsKeyedObject; class plString; - //// Class Definition ///////////////////////////////////////////////////////// -class plCommonObjLibList; -class hsKeyedObject; -class plKey; class plCommonObjLib { protected: diff --git a/Sources/Tools/MaxMain/plComponentDlg.cpp b/Sources/Tools/MaxMain/plComponentDlg.cpp index adc229d1..ca2e76e1 100644 --- a/Sources/Tools/MaxMain/plComponentDlg.cpp +++ b/Sources/Tools/MaxMain/plComponentDlg.cpp @@ -39,20 +39,24 @@ 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 "hsTemplates.h" -#include "plComponentDlg.h" #include "MaxComponent/plComponentBase.h" -#include "MaxComponent/plComponentMgr.h" #include "MaxComponent/plComponentReg.h" -#include "resource.h" #include "plMaxNode.h" -#include "plComponentPanel.h" -#include "plMaxAccelerators.h" +#include "resource.h" #include +#include +#include +#include +#pragma hdrstop + +#include "plComponentDlg.h" +#include "plComponentPanel.h" +#include "plMaxAccelerators.h" extern HINSTANCE hInstance; diff --git a/Sources/Tools/MaxMain/plComponentDlg.h b/Sources/Tools/MaxMain/plComponentDlg.h index 5f151f62..8bdd5f21 100644 --- a/Sources/Tools/MaxMain/plComponentDlg.h +++ b/Sources/Tools/MaxMain/plComponentDlg.h @@ -39,12 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "notify.h" - -#include +class Class_ID; +class Interface; class plMaxNode; +struct NotifyInfo; class plComponentDlg { diff --git a/Sources/Tools/MaxMain/plComponentPanel.cpp b/Sources/Tools/MaxMain/plComponentPanel.cpp index 3dc346cd..82950040 100644 --- a/Sources/Tools/MaxMain/plComponentPanel.cpp +++ b/Sources/Tools/MaxMain/plComponentPanel.cpp @@ -39,13 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plComponentPanel.h" -#include "resource.h" +#include "pnKeyedObject/plKey.h" #include "plMaxNode.h" #include "MaxComponent/plComponent.h" #include "MaxComponent/plComponentMgr.h" +#include "resource.h" +#pragma hdrstop + +#include "plComponentPanel.h" #include "plComponentDlg.h" #include "plMaxAccelerators.h" diff --git a/Sources/Tools/MaxMain/plComponentPanel.h b/Sources/Tools/MaxMain/plComponentPanel.h index 8937d6dc..aa6068b7 100644 --- a/Sources/Tools/MaxMain/plComponentPanel.h +++ b/Sources/Tools/MaxMain/plComponentPanel.h @@ -39,12 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "utilapi.h" -#include "notify.h" -class plMaxNode; class plComponentBase; +class Interface; +class plMaxNode; +class IUtil; +class UtilityObj; class plComponentUtil : public UtilityObj { diff --git a/Sources/Tools/MaxMain/plGetLocationDlg.cpp b/Sources/Tools/MaxMain/plGetLocationDlg.cpp index 69ae90d6..bd6f4ed3 100644 --- a/Sources/Tools/MaxMain/plGetLocationDlg.cpp +++ b/Sources/Tools/MaxMain/plGetLocationDlg.cpp @@ -39,14 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plGetLocationDlg.h" +#include "pnKeyedObject/plKey.h" +#include "hsWindows.h" + #include "plMaxNode.h" -#include "MaxComponent/plMiscComponents.h" -#include "resource.h" -#include "MaxExport/plErrorMsg.h" #include "MaxComponent/plComponent.h" +#include "resource.h" +#pragma hdrstop + +#include "plGetLocationDlg.h" +#include "MaxComponent/plMiscComponents.h" +#include "MaxExport/plErrorMsg.h" plGetLocationDlg::plGetLocationDlg() : fNode(nil), fErrMsg(nil), fDefaultLocation(nil) { diff --git a/Sources/Tools/MaxMain/plMaxAccelerators.cpp b/Sources/Tools/MaxMain/plMaxAccelerators.cpp index b29a55bc..2a58547a 100644 --- a/Sources/Tools/MaxMain/plMaxAccelerators.cpp +++ b/Sources/Tools/MaxMain/plMaxAccelerators.cpp @@ -39,8 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" +#include "hsWindows.h" + +#include +#pragma hdrstop + #include "plMaxAccelerators.h" int plMaxAccelerators::fNumDisables = 0; diff --git a/Sources/Tools/MaxMain/plMaxCFGFile.cpp b/Sources/Tools/MaxMain/plMaxCFGFile.cpp index ab2c734c..69efae87 100644 --- a/Sources/Tools/MaxMain/plMaxCFGFile.cpp +++ b/Sources/Tools/MaxMain/plMaxCFGFile.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "hsWindows.h" + +#include +#pragma hdrstop + #include "plMaxCFGFile.h" -#include "max.h" -#include "HeadSpin.h" #include "plFile/plBrowseFolder.h" const char *plMaxConfig::GetPluginIni() diff --git a/Sources/Tools/MaxMain/plMaxMenu.cpp b/Sources/Tools/MaxMain/plMaxMenu.cpp index b87b9eba..cb7b7d0b 100644 --- a/Sources/Tools/MaxMain/plMaxMenu.cpp +++ b/Sources/Tools/MaxMain/plMaxMenu.cpp @@ -39,13 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "iMenuMan.h" +#include "pnKeyedObject/plKey.h" +#include "hsTemplates.h" +#include "hsWindows.h" + +#include +#include +#include +#include "resource.h" +#include +#pragma hdrstop #include "plMaxMenu.h" #include "plActionTableMgr.h" -#include "resource.h" #include "plSaveSelected.h" #include "plComponentDlg.h" #include "plMaxCFGFile.h" diff --git a/Sources/Tools/MaxMain/plMaxMeshExtractor.cpp b/Sources/Tools/MaxMain/plMaxMeshExtractor.cpp index 72191d0d..0c70956f 100644 --- a/Sources/Tools/MaxMain/plMaxMeshExtractor.cpp +++ b/Sources/Tools/MaxMain/plMaxMeshExtractor.cpp @@ -39,10 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plMaxMeshExtractor.h" -#include "Max.h" + +#include "HeadSpin.h" +#include "pnKeyedObject/plKey.h" +#include "hsMatrix44.h" + #include "plMaxNode.h" -#include "dummy.h" +#include +#pragma hdrstop + +#include "plMaxMeshExtractor.h" + static Mesh* ExtractMesh(INode* pNode, TriObject** ppDeleteMe) { diff --git a/Sources/Tools/MaxMain/plMaxMeshExtractor.h b/Sources/Tools/MaxMain/plMaxMeshExtractor.h index c005d3e5..01aaed09 100644 --- a/Sources/Tools/MaxMain/plMaxMeshExtractor.h +++ b/Sources/Tools/MaxMain/plMaxMeshExtractor.h @@ -42,9 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMaxMeshExtractor_h_inc #define plMaxMeshExtractor_h_inc -#include "HeadSpin.h" -#include "hsMatrix44.h" - +struct hsMatrix44; class plMaxNode; class plMaxMeshExtractor diff --git a/Sources/Tools/MaxMain/plMaxNode.cpp b/Sources/Tools/MaxMain/plMaxNode.cpp index 090c892c..ea88e983 100644 --- a/Sources/Tools/MaxMain/plMaxNode.cpp +++ b/Sources/Tools/MaxMain/plMaxNode.cpp @@ -39,26 +39,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "iparamm2.h" -#include "iparamb2.h" -#include "ISkin.h" -#include "MNMath.h" +#include "plgDispatch.h" +#include "hsFastMath.h" +#include "pnKeyedObject/plKey.h" +#include "plRenderLevel.h" +#include "hsSTLStream.h" +#include "hsStringTokenizer.h" +#include "hsTemplates.h" #include "plMaxNode.h" -//#include "MaxComponent/resource.h" -#include "GlobalUtility.h" - -#include "plgDispatch.h" -#include "plPluginResManager.h" #include "plMaxNodeData.h" +#include "MaxComponent/plComponent.h" +#include +#include +#include +#include +#include +#pragma hdrstop -#include "MaxConvert/plConvert.h" -#include "hsTemplates.h" -#include "hsStringTokenizer.h" +#include "GlobalUtility.h" +#include "plPluginResManager.h" +#include "MaxConvert/plConvert.h" #include "MaxConvert/hsConverterUtils.h" #include "MaxConvert/hsControlConverter.h" #include "MaxConvert/plMeshConverter.h" @@ -71,8 +76,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMaxMeshExtractor.h" #include "MaxPlasmaMtls/Layers/plLayerTex.h" -#include "pnKeyedObject/plKey.h" - #include "pnSceneObject/plSceneObject.h" #include "plScene/plSceneNode.h" #include "plPhysX/plPXPhysical.h" @@ -103,8 +106,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfAnimation/plViewFaceModifier.h" // mf horse temp hack testing to be thrown away #include "plScene/plOccluder.h" -#include "hsFastMath.h" - #include "plDrawable/plDrawableSpans.h" #include "plDrawable/plGeometrySpan.h" @@ -124,8 +125,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxPlasmaMtls/Materials/plDecalMtl.h" +#include "MaxComponent/plAnimComponent.h" #include "MaxComponent/plComponentTools.h" -#include "MaxComponent/plComponent.h" #include "MaxComponent/plComponentExt.h" #include "MaxComponent/plFlexibilityComponent.h" #include "MaxComponent/plLightMapComponent.h" @@ -164,8 +165,6 @@ int GetMatAnimModKey(Mtl* mtl, plMaxNodeBase* node, const plString &segName, hsT // In plAudioComponents int GetSoundNameAndIdx(plComponentBase *comp, plMaxNodeBase *node, const char*& name); -#include "MaxComponent/plAnimComponent.h" - static plString GetAnimCompAnimName(plComponentBase *comp) { if (comp->ClassID() == ANIM_COMP_CID || comp->ClassID() == ANIM_GROUP_COMP_CID) @@ -619,7 +618,6 @@ bool plMaxNode::IFindBones(plErrorMsg *pErrMsg, plConvertSettings *settings) #include "plPhysXCooking.h" #include "plPhysX/plPXStream.h" #include "plPhysX/plSimulationMgr.h" -#include "hsSTLStream.h" bool plMaxNode::MakePhysical(plErrorMsg *pErrMsg, plConvertSettings *settings) { diff --git a/Sources/Tools/MaxMain/plMaxNode.h b/Sources/Tools/MaxMain/plMaxNode.h index 98886eb8..d0eb3fb0 100644 --- a/Sources/Tools/MaxMain/plMaxNode.h +++ b/Sources/Tools/MaxMain/plMaxNode.h @@ -44,41 +44,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plMaxNode_inc #include "plMaxNodeBase.h" - -#include "hsTemplates.h" -#include "hsMatrix44.h" -#include "pnKeyedObject/plKey.h" +#include #include +#include "hsTemplates.h" -class plMaxNode; -class plErrorMsg; +class plAGAnim; +class plAGMasterMod; +class plAGModifier; +class plController; class plConvertSettings; -class plExportProgressBar; -class plSceneNode; -class plDrawable; class plDrawInterface; +class plDrawable; +class plDrawableCriteria; class plDrawableSpans; +class plErrorMsg; +class plExportProgressBar; +class plGeometrySpan; class plLightInfo; -class plSpotLightInfo; +class plLightMapComponent; +class plLightModifier; +class plLtdDirModifier; +class plMaxBoneMap; +class plMaxNode; class plOmniLightInfo; -class plGeometrySpan; -class ISkin; -class plSpotModifier; class plOmniModifier; -class plLtdDirModifier; -class plLightModifier; -class plController; -class plAGModifier; -class plAGMasterMod; -class plAGAnim; -class plRenderLevel; -class plDrawableCriteria; -class plXImposterComp; -class plPhysicalProps; -class plLightMapComponent; class plPageInfoComponent; -class plMaxBoneMap; +class plPhysicalProps; +class plSceneNode; +class plSceneObject; +class plSpotLightInfo; +class plSpotModifier; class plSynchedObject; +class plXImposterComp; typedef bool (plMaxNode:: *PMaxNodeFunc) (plErrorMsg *, plConvertSettings *); // Function pointer to a plMaxNode member funtion diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.cpp b/Sources/Tools/MaxMain/plMaxNodeBase.cpp index 856903cb..3ae21d61 100644 --- a/Sources/Tools/MaxMain/plMaxNodeBase.cpp +++ b/Sources/Tools/MaxMain/plMaxNodeBase.cpp @@ -39,34 +39,39 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "pnKeyedObject/plKey.h" +#include "hsMatrix44.h" +#include "plRenderLevel.h" + #include "plMaxNodeBase.h" #include "plMaxNodeData.h" +#include "MaxComponent/plComponentBase.h" -// Max includes -#include "iparamm2.h" -#include "modstack.h" -#include "ISkin.h" -#include "dummy.h" - -//To support the new Plasma Light Objs, the classes are included below -#include "MaxPlasmaLights/plRealTimeLightBase.h" - +#include +#include +#include +#include +#include +#include -#include #include +#include +#include +#pragma hdrstop + +// To support the new Plasma Light Objs, the classes are included below +#include "MaxPlasmaLights/plRealTimeLightBase.h" #include "GlobalUtility.h" // Only needed for PLASMA_MAX_CLASSID, fix? #include "pnKeyedObject/plUoid.h" -#include "pnKeyedObject/plKey.h" #include "pnModifier/plModifier.h" #include "MaxPlasmaMtls/Materials/plDecalMtl.h" -#include "MaxComponent/plComponentBase.h" - CoreExport void *__cdecl MAX_new(size_t size); CoreExport void __cdecl MAX_delete(void* mem); diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.h b/Sources/Tools/MaxMain/plMaxNodeBase.h index b421316a..f991f0ae 100644 --- a/Sources/Tools/MaxMain/plMaxNodeBase.h +++ b/Sources/Tools/MaxMain/plMaxNodeBase.h @@ -42,24 +42,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMaxNodeBase_inc #define plMaxNodeBase_inc -#include "HeadSpin.h" -#include "hsTemplates.h" -#include "hsMatrix44.h" -#include "hsColorRGBA.h" -#include "pnKeyedObject/plKey.h" #include "plLoadMask.h" +#include "pnKeyedObject/plKey.h" +#include "hsMatrix44.h" +#include "plRenderLevel.h" +#include "hsWindows.h" + +#include -class plLocation; -class plSceneObject; -class plModifier; class plComponentBase; -class ISkin; -class plMaxNodeData; class hsGMesh; -class plRenderLevel; class plGeometrySpan; -class plSharedMesh; +class plLocation; class plMaxBoneMap; +class plMaxNodeData; +class plModifier; +class plSceneObject; +class plSharedMesh; +class ISkin; //------------------------------------------- // plMaxNodeBase diff --git a/Sources/Tools/MaxMain/plMaxNodeData.h b/Sources/Tools/MaxMain/plMaxNodeData.h index a9920892..5c98c35d 100644 --- a/Sources/Tools/MaxMain/plMaxNodeData.h +++ b/Sources/Tools/MaxMain/plMaxNodeData.h @@ -43,22 +43,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMaxNodeData_inc #define plMaxNodeData_inc -#include "HeadSpin.h" -#include "hsTemplates.h" -#include "hsColorRGBA.h" -#include "plRenderLevel.h" -#include "plPhysicalProps.h" #include "hsBitVector.h" -#include "pnKeyedObject/plKey.h" #include "plLoadMask.h" +#include "plPhysicalProps.h" +#include "hsTemplates.h" -class plMaxNodeBase; -class plMaxNode; -class plLocation; -class plSceneObject; class hsGMesh; class plGeometrySpan; +class plLocation; +class plKey; class plMaxBoneMap; +class plMaxNode; +class plMaxNodeBase; +class plSceneObject; class plSharedMesh; class plMaxNodeBaseTab : public Tab diff --git a/Sources/Tools/MaxMain/plMaxUtils.cpp b/Sources/Tools/MaxMain/plMaxUtils.cpp index 6060d991..ec521908 100644 --- a/Sources/Tools/MaxMain/plMaxUtils.cpp +++ b/Sources/Tools/MaxMain/plMaxUtils.cpp @@ -39,14 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plMaxUtils.h" +#include "pnKeyedObject/plKey.h" +#include "hsWindows.h" + #include "resource.h" -#include "hsResMgr.h" +#include +#include +#include +#pragma hdrstop + +#include "plMaxUtils.h" #include "plResMgr/plPageInfo.h" #include "pnKeyedObject/plUoid.h" -#include "pnKeyedObject/plKey.h" #include "pnFactory/plFactory.h" class MaxUtilsClassDesc : public ClassDesc @@ -115,7 +122,7 @@ BOOL plMaxUtils::DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) #include "plMtlCollector.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" #ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/AssManTypes.h" +# include "../../AssetMan/PublicInterface/AssManTypes.h" #endif int ClearTextureIds() @@ -154,16 +161,3 @@ int ClearTextureIds() return 0; #endif } -/* -void ClearAssetsRecur(plMaxNode* node) -{ - plComponentBase* comp = node->ConvertToComponent(); - if (comp && plAudioComp::IsSoundComponent(comp)) - { - plBaseSoundEmitterComponent* soundComp = (plBaseSoundEmitterComponent*)comp; - soundComp->SetSoundAssetId(kBaseSound, - kCoverSound -) - } -} -*/ \ No newline at end of file diff --git a/Sources/Tools/MaxMain/plMaxUtils.h b/Sources/Tools/MaxMain/plMaxUtils.h index 2495f204..6250a494 100644 --- a/Sources/Tools/MaxMain/plMaxUtils.h +++ b/Sources/Tools/MaxMain/plMaxUtils.h @@ -39,8 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "utilapi.h" + +class Interface; +class IUtil; +class UtilityObj; // This a central repository for handy debugging tools for Max that don't fit in anywhere else. class plMaxUtils : public UtilityObj diff --git a/Sources/Tools/MaxMain/plMtlCollector.cpp b/Sources/Tools/MaxMain/plMtlCollector.cpp index aa82303b..950f8982 100644 --- a/Sources/Tools/MaxMain/plMtlCollector.cpp +++ b/Sources/Tools/MaxMain/plMtlCollector.cpp @@ -39,7 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include + +#include "MaxMain/plMaxNodeBase.h" +#include +#pragma hdrstop + #include "plMtlCollector.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" @@ -51,11 +58,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "MaxPlasmaMtls/Materials/plPassMtl.h" #include "MaxPlasmaMtls/Materials/plClothingMtl.h" +#include "MaxComponent/plMiscComponents.h" #include "MaxComponent/plGUIComponents.h" #include "MaxComponent/pfGUISkinComp.h" -#include "MaxComponent/plMiscComponents.h" -#include "MaxMain/plMaxNodeBase.h" static bool IsPlasmaMtl(Mtl *mtl) { diff --git a/Sources/Tools/MaxMain/plMtlCollector.h b/Sources/Tools/MaxMain/plMtlCollector.h index 6da10b89..840a2c5e 100644 --- a/Sources/Tools/MaxMain/plMtlCollector.h +++ b/Sources/Tools/MaxMain/plMtlCollector.h @@ -42,14 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMtlCollector_h_inc #define plMtlCollector_h_inc -#include "HeadSpin.h" -#include -#include "hsSTLSortUtils.h" +#include "hsStlSortUtils.h" +class PBBitmap; class Mtl; -class Texmap; class plPlasmaMAXLayer; -class PBBitmap; +class stringISorter; +class Texmap; typedef std::set MtlSet; typedef std::set TexSet; diff --git a/Sources/Tools/MaxMain/plNodeLock.cpp b/Sources/Tools/MaxMain/plNodeLock.cpp index da41e696..a7b82d40 100644 --- a/Sources/Tools/MaxMain/plNodeLock.cpp +++ b/Sources/Tools/MaxMain/plNodeLock.cpp @@ -39,9 +39,12 @@ 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 +#pragma hdrstop #include "plNodeLock.h" diff --git a/Sources/Tools/MaxMain/plPhysXCooking.cpp b/Sources/Tools/MaxMain/plPhysXCooking.cpp index 94f0aa3d..874fbfbd 100644 --- a/Sources/Tools/MaxMain/plPhysXCooking.cpp +++ b/Sources/Tools/MaxMain/plPhysXCooking.cpp @@ -39,20 +39,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plPhysXCooking.h" + +#include "HeadSpin.h" #include "hsGeometry3.h" +#include "hsMatrix44.h" +#include "hsSTLStream.h" +#pragma hdrstop + +#include +#include +#include +#include +#include +#include +#include + +#include "plMaxMeshExtractor.h" + +#include "plPhysXCooking.h" #include "plPhysX/plSimulationMgr.h" #include "plPhysX/plPXStream.h" #include "plPhysX/plPXConvert.h" -#include "hsSTLStream.h" -#include "Nx.h" -#include "NxStream.h" -#include "NxPhysics.h" -#include "NxCooking.h" -#include "NxPlane.h" -#include "NxUtilLib.h" -#include "NxMat33.h" bool plPhysXCooking::fSkipErrors = false; NxUtilLib* plPhysXCooking::fUtilLib =nil; diff --git a/Sources/Tools/MaxMain/plPhysXCooking.h b/Sources/Tools/MaxMain/plPhysXCooking.h index 3e4cc5d7..bbabb486 100644 --- a/Sources/Tools/MaxMain/plPhysXCooking.h +++ b/Sources/Tools/MaxMain/plPhysXCooking.h @@ -42,15 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysXCooking_h_inc #define plPhysXCooking_h_inc -#include "HeadSpin.h" -#include "hsGeometry3.h" -#include "plMaxMeshExtractor.h" -class hsStream; -class hsVectorStream; class NxConvexMesh; +struct hsPlane3; +struct hsPoint3; +class hsStream; +class NxMat33; class NxUtilLib; class NxVec3; -class NxMat33; +class hsVectorStream; class plPhysXCooking { diff --git a/Sources/Tools/MaxMain/plPhysicalProps.cpp b/Sources/Tools/MaxMain/plPhysicalProps.cpp index 7c9147e0..7ac98ccd 100644 --- a/Sources/Tools/MaxMain/plPhysicalProps.cpp +++ b/Sources/Tools/MaxMain/plPhysicalProps.cpp @@ -39,13 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#include "plMaxNode.h" +#pragma hdrstop + #include "plPhysicalProps.h" #include "plPhysical/plSimDefs.h" // For plBoundsType #include "pnSceneObject/plSimulationInterface.h" -#include "plMaxNode.h" + #include "MaxExport/plErrorMsg.h" /** These enums are used to indicate which parameters are ignorable and can diff --git a/Sources/Tools/MaxMain/plPhysicalProps.h b/Sources/Tools/MaxMain/plPhysicalProps.h index 7d70b149..75ba90f3 100644 --- a/Sources/Tools/MaxMain/plPhysicalProps.h +++ b/Sources/Tools/MaxMain/plPhysicalProps.h @@ -42,11 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalProps_h_inc #define plPhysicalProps_h_inc -#include "HeadSpin.h" -#include "..\..\NucleusLib\pnKeyedObject\plKey.h" - -class plMaxNode; class plErrorMsg; +class plMaxNode; class plPhysicalProps { diff --git a/Sources/Tools/MaxMain/plPluginResManager.cpp b/Sources/Tools/MaxMain/plPluginResManager.cpp index 2db1630e..70d2e923 100644 --- a/Sources/Tools/MaxMain/plPluginResManager.cpp +++ b/Sources/Tools/MaxMain/plPluginResManager.cpp @@ -40,22 +40,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plPluginResManager.h" -#include "HeadSpin.h" +#include "plgDispatch.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" +#pragma hdrstop + +// For our common object libs +#include "plCommonObjLib.h" +#include "MaxComponent/plMiscComponents.h" + +#include "plPluginResManager.h" #include "plResMgr/plRegistryNode.h" #include "plResMgr/plRegistryHelpers.h" #include "plResMgr/plVersion.h" #include "plResMgr/plResMgrSettings.h" #include "plScene/plSceneNode.h" -#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKeyImp.h" #include "plAgeDescription/plAgeDescription.h" -#include "plgDispatch.h" - -// For our common object libs -#include "plCommonObjLib.h" -#include "MaxComponent/plMiscComponents.h" plKey plPluginResManager::NameToLoc(const char* age, const char* page, int32_t sequenceNumber, bool itinerant) { diff --git a/Sources/Tools/MaxMain/plPluginResManager.h b/Sources/Tools/MaxMain/plPluginResManager.h index d295e872..392b4c03 100644 --- a/Sources/Tools/MaxMain/plPluginResManager.h +++ b/Sources/Tools/MaxMain/plPluginResManager.h @@ -42,10 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPluginResManager_h_inc #define plPluginResManager_h_inc +#include "hsResMgr.h" #include "plResMgr/plResManager.h" -#include "pnKeyedObject/plKey.h" -#include "hsTemplates.h" +class plKey; +class plLocation; class plPageInfo; class plRegistryPageNode; class plSceneNode; diff --git a/Sources/Tools/MaxMain/plPythonMgr.cpp b/Sources/Tools/MaxMain/plPythonMgr.cpp index 88dbf883..aeb2c4c0 100644 --- a/Sources/Tools/MaxMain/plPythonMgr.cpp +++ b/Sources/Tools/MaxMain/plPythonMgr.cpp @@ -40,17 +40,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plPythonMgr.h" +#include "hsFiles.h" +#include "plgDispatch.h" +#include "hsWindows.h" -#include "MaxComponent/plAutoUIBlock.h" -//#include "Python.h" +#include +#include +#include + +#include +#include +#pragma hdrstop + +#include "plPythonMgr.h" #include "plMaxCFGFile.h" -#include "hsFiles.h" -#include "plgDispatch.h" +#include "MaxComponent/plAutoUIBlock.h" +#include "MaxComponent/plPythonFileComponent.h" +#include "MaxComponent/plResponderComponent.h" #include "pfPython/cyPythonInterface.h" - plPythonMgr::plPythonMgr() { } @@ -127,10 +136,6 @@ bool ICallStrFunc(PyObject *dict, char *funcName, char*& val) return false; } - -#include "MaxComponent/plPythonFileComponent.h" - - enum ParamTypes { // These numbers used in the python/plasma/glue.py code @@ -565,8 +570,6 @@ void plPythonMgr::IAddGUISkin(plAutoUIBlock *autoUI, PyObject *tuple, char *para autoUI->AddPickGUISkinButton(id, nil, paramName, vid, vstates); } -#include "MaxComponent/plResponderComponent.h" - void plPythonMgr::IAddResponder(plAutoUIBlock *autoUI, PyObject *tuple, char *paramName, int id, int vid, std::vector* vstates) { std::vector cids; diff --git a/Sources/Tools/MaxMain/plPythonMgr.h b/Sources/Tools/MaxMain/plPythonMgr.h index a2e687f0..3b0a9fbb 100644 --- a/Sources/Tools/MaxMain/plPythonMgr.h +++ b/Sources/Tools/MaxMain/plPythonMgr.h @@ -39,11 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" -#include "python.h" -#include class plAutoUIBlock; +typedef struct _object PyObject; class plPythonMgr { diff --git a/Sources/Tools/MaxMain/plResCollector.cpp b/Sources/Tools/MaxMain/plResCollector.cpp index 754f7836..2e2e93e3 100644 --- a/Sources/Tools/MaxMain/plResCollector.cpp +++ b/Sources/Tools/MaxMain/plResCollector.cpp @@ -39,10 +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 "plResCollector.h" #include "plMtlCollector.h" -#include "max.h" #include "MaxExport/plExportProgressBar.h" void plResCollector::Collect() diff --git a/Sources/Tools/MaxMain/plResetXform.cpp b/Sources/Tools/MaxMain/plResetXform.cpp index 34cfdeb9..01a8f6e4 100644 --- a/Sources/Tools/MaxMain/plResetXform.cpp +++ b/Sources/Tools/MaxMain/plResetXform.cpp @@ -39,14 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" - -#include "max.h" -#include "plResetXform.h" +#include "HeadSpin.h" +#include "pnKeyedObject/plKey.h" #include "MaxMain/plMaxNode.h" #include "MaxComponent/plComponent.h" +#pragma hdrstop + +#include "plResetXform.h" void plResetXform::ResetSelected() const diff --git a/Sources/Tools/MaxMain/plResetXform.h b/Sources/Tools/MaxMain/plResetXform.h index 9cb921ac..8586f41a 100644 --- a/Sources/Tools/MaxMain/plResetXform.h +++ b/Sources/Tools/MaxMain/plResetXform.h @@ -44,11 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plResetXform_inc class Interface; -class INode; -class TriObject; - class plMaxNode; +class INode; class INodeTab; +class TriObject; class plResetXform { diff --git a/Sources/Tools/MaxMain/plSaveSelected.cpp b/Sources/Tools/MaxMain/plSaveSelected.cpp index 3dcfe93c..dbafd8eb 100644 --- a/Sources/Tools/MaxMain/plSaveSelected.cpp +++ b/Sources/Tools/MaxMain/plSaveSelected.cpp @@ -39,13 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "max.h" -#include "notify.h" + #include "MaxComponent/plComponent.h" -#include #include "plMaxNode.h" +#include +#include +#include +#include +#include +#pragma hdrstop + + + bool IIsNodeInTab(INodeTab &tab, INode *node) { for (int i = 0; i < tab.Count(); i++) diff --git a/Sources/Tools/MaxMain/plTextureExportLog.cpp b/Sources/Tools/MaxMain/plTextureExportLog.cpp index f217c944..c4f30092 100644 --- a/Sources/Tools/MaxMain/plTextureExportLog.cpp +++ b/Sources/Tools/MaxMain/plTextureExportLog.cpp @@ -49,7 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "HeadSpin.h" +#include "pnKeyedObject/plKey.h" +#include "hsStream.h" +#pragma hdrstop #include "plTextureExportLog.h" #include "plGImage/plCubicEnvironmap.h" @@ -57,9 +59,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plGImage/plDynamicTextMap.h" #include "plPipeline/plRenderTarget.h" #include "plPipeline/plCubicRenderTarget.h" -#include "pnKeyedObject/plKey.h" - -#include "hsStream.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Tools/MaxMain/plTextureSearch.cpp b/Sources/Tools/MaxMain/plTextureSearch.cpp index ee8d4424..27c32b85 100644 --- a/Sources/Tools/MaxMain/plTextureSearch.cpp +++ b/Sources/Tools/MaxMain/plTextureSearch.cpp @@ -39,28 +39,35 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" -#include "plTextureSearch.h" +#include "hsWindows.h" + #include "resource.h" +#include +#include +#include +#include +#include +#pragma hdrstop -#define PB2Export __declspec( dllexport ) // Because I don't feel like including all the paramblock crap -#include "pbbitmap.h" -#include "bmmlib.h" -#include "IMtlEdit.h" +#include "plTextureSearch.h" #include "plMtlCollector.h" #include "plMaxAccelerators.h" #include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h" -#ifdef MAXASS_AVAILABLE -#include "../../AssetMan/PublicInterface/MaxAssInterface.h" -#endif -// Not a class member so we don't have to make everyone who uses this know about AssetMan #ifdef MAXASS_AVAILABLE -static jvUniqueId gAssetID; +# include "../../AssetMan/PublicInterface/MaxAssInterface.h" + + // Not a class member so we don't have to make everyone who uses this know about AssetMan + static jvUniqueId gAssetID; #endif +// Avoids including all the component stuff +#define PB2Export __declspec( dllexport ) + plTextureSearch::plTextureSearch() : fDlg(NULL) { #ifdef MAXASS_AVAILABLE diff --git a/Sources/Tools/MaxMain/plTextureSearch.h b/Sources/Tools/MaxMain/plTextureSearch.h index 0a1ed7a3..01cda5bb 100644 --- a/Sources/Tools/MaxMain/plTextureSearch.h +++ b/Sources/Tools/MaxMain/plTextureSearch.h @@ -39,7 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "max.h" class plTextureSearch {