diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index 3be35266..616a0c7d 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -113,7 +113,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plProxyDrawMsg.h" #include "pnMessage/plObjRefMsg.h" #include "pnMessage/plAttachMsg.h" -#include "plMessage/plSimInfluenceMsg.h" #include "plMessage/plSimStateMsg.h" #include "plMessage/plLinkToAgeMsg.h" #include "pfMessage/pfKIMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index 0d0385ff..128ecaa9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -19,7 +19,6 @@ set(pfPython_SOURCES cyParticleSys.cpp cyPhysics.cpp cyPythonInterface.cpp - Pch.cpp plPythonFileMod.cpp plPythonPack.cpp plPythonSDLModifier.cpp @@ -200,8 +199,6 @@ set(pfPython_GLUE pyAgeLinkStructGlue.cpp pyAgeVaultGlue.cpp pyAudioControlGlue.cpp - pyCCRMgrGlue.cpp - pyCCRMgrGlue2.cpp pyClusterGlue.cpp pyColorGlue.cpp pyCritterBrainGlue.cpp diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.cpp b/Sources/Plasma/FeatureLib/pfPython/Pch.cpp deleted file mode 100644 index e0496da4..00000000 --- a/Sources/Plasma/FeatureLib/pfPython/Pch.cpp +++ /dev/null @@ -1,43 +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 "Pch.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp index 542209be..549f30fe 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -53,7 +53,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plEnableMsg.h" #include "pnMessage/plWarpMsg.h" -#include "plMessage/plSimInfluenceMsg.h" #include "plMessage/plSimStateMsg.h" #include "plMessage/plLinearVelocityMsg.h" #include "plMessage/plAngularVelocityMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp deleted file mode 100644 index b26d582e..00000000 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp +++ /dev/null @@ -1,48 +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 -#pragma hdrstop - -#include "pyCCRMgr.h" -#include "pyAgeLinkStruct.h" - diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp deleted file mode 100644 index a554abf0..00000000 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp +++ /dev/null @@ -1,47 +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 -#pragma hdrstop - -#include "pyCCRMgr.h" - diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp deleted file mode 100644 index 74900742..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt index 4f2e1c81..468a529e 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt @@ -2,52 +2,25 @@ include_directories("../../CoreLib") include_directories("../../NucleusLib") include_directories("../../NucleusLib/inc") -set(pnGameMgr_BLUESPIRAL +set(pnGameMgr_GAMES BlueSpiral/pnGmBlueSpiral.h - BlueSpiral/pnGmBlueSpiral.cpp -) - -set(pnGameMgr_CLIMBINGWALL ClimbingWall/pnGmClimbingWall.h - ClimbingWall/pnGmClimbingWall.cpp -) - -set(pnGameMgr_HEEK Heek/pnGmHeek.h - Heek/pnGmHeek.cpp -) - -set(pnGameMgr_MARKER Marker/pnGmMarker.h - Marker/pnGmMarker.cpp -) - -set(pnGameMgr_TICTACTOE TicTacToe/pnGmTicTacToe.h - TicTacToe/pnGmTicTacToe.cpp -) - -set(pnGameMgr_VARSYNC VarSync/pnGmVarSync.h - VarSync/pnGmVarSync.cpp ) set(pnGameMgr_SOURCES Intern.h Pch.h pnGameMgr.h + + # Needs at least one C++ file to show up in VS solution pnGameMgr.cpp ) -add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_BLUESPIRAL} - ${pnGameMgr_CLIMBINGWALL} ${pnGameMgr_HEEK} - ${pnGameMgr_MARKER} ${pnGameMgr_TICTACTOE} - ${pnGameMgr_VARSYNC}) +add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_GAMES}) -source_group("BlueSpiral" FILES ${pnGameMgr_BLUESPIRAL}) -source_group("ClimbingWall" FILES ${pnGameMgr_CLIMBINGWALL}) -source_group("Heek" FILES ${pnGameMgr_HEEK}) -source_group("Marker" FILES ${pnGameMgr_MARKER}) -source_group("TicTacToe" FILES ${pnGameMgr_TICTACTOE}) -source_group("VarSync" FILES ${pnGameMgr_VARSYNC}) +source_group("Games" FILES ${pnGameMgr_GAMES}) source_group("" FILES ${pnGameMgr_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp deleted file mode 100644 index 1a0db451..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.cpp deleted file mode 100644 index ad2744c0..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.cpp deleted file mode 100644 index ecb901ac..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.cpp deleted file mode 100644 index 5e4ed383..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.cpp b/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.cpp deleted file mode 100644 index cb8464b1..00000000 --- a/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.cpp +++ /dev/null @@ -1,49 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.cpp -* -***/ - -#include "../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt index a6a65a51..4657d3ca 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt @@ -24,7 +24,6 @@ set(pnNetProtocol_PROTO_CLI2AUTH set(pnNetProtocol_PROTO_CLI2FILE Private/Protocols/Cli2File/pnNpCli2File.h - Private/Protocols/Cli2File/pnNpCli2File.cpp ) set(pnNetProtocol_PROTO_CLI2GAME diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.cpp deleted file mode 100644 index 4be97102..00000000 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.cpp +++ /dev/null @@ -1,50 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.cpp -* -***/ - -#define USES_PROTOCOL_CLI2FILE -#include "../../../Pch.h" -#pragma hdrstop diff --git a/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt index e7202102..47c39581 100644 --- a/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt @@ -11,7 +11,6 @@ set(pnTimer_HEADERS set(pnTimer_SOURCES hsTimer.cpp - plTimedValue.cpp plTimerCallbackManager.cpp pnBranchDate.cpp pnBuildDates.cpp diff --git a/Sources/Plasma/NucleusLib/pnTimer/plTimedValue.cpp b/Sources/Plasma/NucleusLib/pnTimer/plTimedValue.cpp deleted file mode 100644 index fc025078..00000000 --- a/Sources/Plasma/NucleusLib/pnTimer/plTimedValue.cpp +++ /dev/null @@ -1,47 +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 "hsTimer.h" -#include "plTimedValue.h" - diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp index fad2d7fb..b1668904 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp @@ -69,7 +69,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnSceneObject/plDrawInterface.h" #include "plPhysical.h" -#include "plMessage/plSimInfluenceMsg.h" #include "plSurface/hsGMaterial.h" #include "plDrawable/plDrawableSpans.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt index a6be9e4c..8caa137c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt @@ -29,7 +29,6 @@ set(plMessage_SOURCES plLOSRequestMsg.cpp plMatrixUpdateMsg.cpp plMultistageMsg.cpp - plNetClientMgrMsg.cpp plNetCommMsgs.cpp plNetVoiceListMsg.cpp plOneShotCallbacks.cpp @@ -37,7 +36,6 @@ set(plMessage_SOURCES plRenderRequestMsg.cpp plRideAnimatedPhysMsg.cpp plRippleShapeMsg.cpp - plSimInfluenceMsg.cpp plSimStateMsg.cpp plSwimMsg.cpp plSynchEnableMsg.cpp @@ -111,7 +109,6 @@ set(plMessage_HEADERS plRippleShapeMsg.h plRoomLoadNotifyMsg.h plShadowCastMsg.h - plSimInfluenceMsg.h plSimStateMsg.h plSpawnModMsg.h plSpawnRequestMsg.h diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h index 6cbdbdbc..906e050c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h @@ -145,18 +145,6 @@ REGISTER_CREATABLE( plDeviceRecreateMsg ); REGISTER_CREATABLE( plLightRefMsg ); -#include "plSimInfluenceMsg.h" - -// REGISTER_CREATABLE( plSimInfluenceMsg ); -// REGISTER_CREATABLE( plForceMsg ); -// REGISTER_CREATABLE( plOffsetForceMsg ); -// REGISTER_CREATABLE( plTorqueMsg ); -// REGISTER_CREATABLE( plImpulseMsg ); -// REGISTER_CREATABLE( plOffsetImpulseMsg ); -// REGISTER_CREATABLE( plAngularImpulseMsg ); -// REGISTER_CREATABLE( plDampMsg ); -// REGISTER_CREATABLE( plShiftMassMsg ); - #include "plSimStateMsg.h" // REGISTER_CREATABLE( plSimStateMsg ); diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.cpp deleted file mode 100644 index eff5f423..00000000 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.cpp +++ /dev/null @@ -1,48 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.cpp -* -***/ - -#include "plNetClientMgrMsg.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp deleted file mode 100644 index 28faca2d..00000000 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp +++ /dev/null @@ -1,182 +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 "plMessage/plSimInfluenceMsg.h" -#include "hsStream.h" -/* - -void plSimInfluenceMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimulationMsg::Read(stream, mgr); -} - -void plSimInfluenceMsg::Write(hsStream *stream, hsResMgr *mgr) -{ - plSimulationMsg::Write(stream, mgr); -} - - -// PLFORCEMSG -void plForceMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fForce.Read(stream); -} - -void plForceMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fForce.Write(stream); -} - -// PLOFFSETFORCEMSG -void plOffsetForceMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plForceMsg::Read(stream, mgr); - - fPoint.Read(stream); -} - -void plOffsetForceMsg::Write(hsStream *stream, hsResMgr *mgr) -{ - plForceMsg::Write(stream, mgr); - - fPoint.Write(stream); -} - - -// PLTORQUEMSG -void plTorqueMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fTorque.Read(stream); -} - -void plTorqueMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fTorque.Write(stream); -} - - -// PLIMPULSE -void plImpulseMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fImpulse.Read(stream); -} - -void plImpulseMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fImpulse.Write(stream); -} - - -// PLOFFSETIMPULSE -void plOffsetImpulseMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fPoint.Read(stream); -} - -void plOffsetImpulseMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fPoint.Write(stream); -} - - -// PLANGULARIMPULSE -void plAngularImpulseMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fImpulse.Read(stream); -} - -void plAngularImpulseMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fImpulse.Write(stream); -} - - -// PLDAMPMSG -void plDampMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - stream->WriteLEScalar(fDamp); -} - -void plDampMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fDamp = stream->ReadLEScalar(); -} - - -// PLSHIFTCENTERMSG -void plShiftMassMsg::Read(hsStream *stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Read(stream, mgr); - - fOffset.Read(stream); -} - -void plShiftMassMsg::Write(hsStream * stream, hsResMgr *mgr) -{ - plSimInfluenceMsg::Write(stream, mgr); - - fOffset.Write(stream); -} -*/ \ No newline at end of file diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h deleted file mode 100644 index ff0507c1..00000000 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h +++ /dev/null @@ -1,298 +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==*/ -// SIMULATION MESSAGES -// Messages that influence the movement of a physically simulated object - -#ifndef PLSIMINFLUENCEMSG_H -#define PLSIMINFLUENCEMSG_H -/* -#include "pnMessage/plSimulationMsg.h" -#include "hsGeometry3.h" - -//////////// -// -// INFLUENCE -// -//////////// - -// PLSIMULATIONINFLUENCEMSG (virtual) -// base for messages that are used to push physical objects around in one way or another -class plSimInfluenceMsg : public plSimulationMsg -{ -public: - plSimInfluenceMsg() : plSimulationMsg() {}; - plSimInfluenceMsg(const plKey& sender, const plKey &receiver, double *time) - :plSimulationMsg(sender, receiver, time){}; - - CLASSNAME_REGISTER( plSimInfluenceMsg ); - GETINTERFACE_ANY( plSimInfluenceMsg, plSimulationMsg); - - virtual void Read(hsStream *stream, hsResMgr *mgr); - virtual void Write(hsStream *stream, hsResMgr *mgr); -}; - - -// FORCES -///////// - -// PLFORCEMSG -// apply a force to the center of mass of the receiver -class plForceMsg : public plSimInfluenceMsg -{ -public: - plForceMsg() : plSimInfluenceMsg() { }; - plForceMsg::plForceMsg(const plKey& sender, const plKey &receiver, hsVector3 &force) - :plSimInfluenceMsg(sender, receiver, nil), fForce(force) {}; - plForceMsg::plForceMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 &force) - :plSimInfluenceMsg(sender, receiver, time), fForce(force) {}; - - CLASSNAME_REGISTER( plForceMsg ); - GETINTERFACE_ANY( plForceMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsVector3 GetForce() const { return fForce; } - - void SetForce(const hsVector3 &the_Force) - { fForce = the_Force; } - -protected: - hsVector3 fForce; -}; - - -// PLOFFSETFORCE -// apply a force to the receiver as though it were being impacted at the -// given point in global space -class plOffsetForceMsg : public plForceMsg -{ -public: - plOffsetForceMsg() : plForceMsg() { }; - plOffsetForceMsg(const plKey& sender, const plKey &receiver, hsVector3 &force, hsPoint3 &point) - :plForceMsg(sender, receiver, nil, force), fPoint(point) {}; - plOffsetForceMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 &force, hsPoint3 &point) - :plForceMsg(sender, receiver, time, force), fPoint(point) {}; - - CLASSNAME_REGISTER( plOffsetForceMsg ); - GETINTERFACE_ANY( plOffsetForceMsg, plForceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsPoint3 GetPoint() const { return fPoint; } - - void SetPoint(const hsPoint3 &the_Point) - { fPoint = the_Point; } - -protected: - hsPoint3 fPoint; -}; - -// PLTORQUEMSG -// Apply the given torque force to the body -// The vector indicates the axes, and the magnitude indicates the strength -class plTorqueMsg : public plSimInfluenceMsg -{ -public: - plTorqueMsg() : plSimInfluenceMsg() { }; - plTorqueMsg(const plKey& sender, const plKey &receiver, hsVector3 & torque) - :plSimInfluenceMsg(sender, receiver, nil), fTorque(torque) {}; - - CLASSNAME_REGISTER( plTorqueMsg ); - GETINTERFACE_ANY( plTorqueMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsVector3 GetTorque() const { return fTorque; } - void SetTorque(const hsVector3 &the_Torque) { fTorque = the_Torque; } - -protected: - hsVector3 fTorque; - -}; - -// IMPULSES -/////////// - -// PLIMPULSE -// Add the given vector to the objects velocity -class plImpulseMsg : public plSimInfluenceMsg -{ -public: - plImpulseMsg() : plSimInfluenceMsg() { }; - plImpulseMsg(const plKey& sender, const plKey &receiver, hsVector3 &impulse) - :plSimInfluenceMsg(sender, receiver, nil), fImpulse(impulse) {}; - plImpulseMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 &impulse) - :plSimInfluenceMsg(sender, receiver, time), fImpulse(impulse) {}; - - CLASSNAME_REGISTER( plImpulseMsg ); - GETINTERFACE_ANY( plImpulseMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsVector3 GetImpulse() const { return fImpulse; } - void SetImpulse(const hsVector3 &the_Impulse) { fImpulse = the_Impulse; } - -protected: - hsVector3 fImpulse; - -}; - -// PLOFFSETIMPULSE -// Apply the given impulse to the object at the given point in global space -// Will impart torque if not applied to center of mass -class plOffsetImpulseMsg : public plImpulseMsg -{ -public: - plOffsetImpulseMsg() : plImpulseMsg() { }; - plOffsetImpulseMsg(const plKey& sender, const plKey &receiver, hsVector3 & impulse, hsPoint3 &point) - : plImpulseMsg(sender, receiver, impulse), fPoint(point) {}; - plOffsetImpulseMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 & impulse, hsPoint3 &point) - : plImpulseMsg(sender, receiver, time, impulse), fPoint(point) {}; - - CLASSNAME_REGISTER( plOffsetImpulseMsg ); - GETINTERFACE_ANY( plOffsetImpulseMsg, plImpulseMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsPoint3 GetPoint() const { return fPoint; } - void SetPoint(const hsPoint3 &the_Point) { fPoint = the_Point; } - -protected: - hsPoint3 fPoint; - -}; - - -// PLANGULARIMPULSE -// Add the given vector (representing a rotation axis and magnitude) -// to the -class plAngularImpulseMsg : public plSimInfluenceMsg -{ -public: - plAngularImpulseMsg() : plSimInfluenceMsg() { }; - plAngularImpulseMsg(const plKey& sender, const plKey &receiver, hsVector3 &impulse) - : plSimInfluenceMsg(sender, receiver, nil), fImpulse(impulse) {}; - plAngularImpulseMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 &impulse) - : plSimInfluenceMsg(sender, receiver, time), fImpulse(impulse) {}; - - CLASSNAME_REGISTER( plAngularImpulseMsg ); - GETINTERFACE_ANY( plAngularImpulseMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsVector3 GetImpulse() const { return fImpulse; } - - void SetImpulse(const hsVector3 &the_Impulse) - { fImpulse = the_Impulse; } - -protected: - hsVector3 fImpulse; -}; - - -// MISCELLANEOUS INFLUENCES -/////////////////////////// - -// PLDAMPMSG -// Decrease all velocities on the given object. -// A damp factor of 0 nulls them all entirely; -// A damp factor of 1 leaves them alone. -class plDampMsg : public plSimInfluenceMsg -{ -public: - plDampMsg() : plSimInfluenceMsg() { }; - plDampMsg(const plKey& sender, const plKey &receiver, float dampFactor) - : plSimInfluenceMsg(sender, receiver, nil), fDamp(dampFactor) {}; - plDampMsg(const plKey& sender, const plKey &receiver, double *time, float dampFactor) - : plSimInfluenceMsg(sender, receiver, time), fDamp(dampFactor) {}; - - CLASSNAME_REGISTER( plDampMsg ); - GETINTERFACE_ANY( plDampMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - float GetDamp() const { return fDamp; } - - void SetDamp( float the_Damp ) - { fDamp = the_Damp; } - -protected: - float fDamp; -}; - -// PLSHIFTCENTERMSG -// Shift the center of mass of the given object by the given -// amount in the given direction. -class plShiftMassMsg : public plSimInfluenceMsg -{ -public: - plShiftMassMsg() : plSimInfluenceMsg() { }; - plShiftMassMsg(const plKey& sender, const plKey &receiver, hsVector3 &offset) - :plSimInfluenceMsg(sender, receiver, nil), fOffset(offset) {}; - plShiftMassMsg(const plKey& sender, const plKey &receiver, double *time, hsVector3 &offset) - :plSimInfluenceMsg(sender, receiver, time), fOffset(offset) {}; - - CLASSNAME_REGISTER( plShiftMassMsg ); - GETINTERFACE_ANY( plShiftMassMsg, plSimInfluenceMsg); - - void Read(hsStream *stream, hsResMgr *mgr); - void Write(hsStream *stream, hsResMgr *mgr); - - hsVector3 GetOffset() const { return fOffset; } - - void SetOffset(const hsVector3 &the_Offset) - { fOffset = the_Offset; } - -protected: - hsVector3 fOffset; -}; -*/ -#endif // PLSIMINFLUENCEMSG_H - - \ No newline at end of file diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index 390ab03d..361a77c0 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -62,7 +62,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plNodeRefMsg.h" #include "pnMessage/plSDLModifierMsg.h" #include "plMessage/plSimStateMsg.h" -#include "plMessage/plSimInfluenceMsg.h" #include "plMessage/plLinearVelocityMsg.h" #include "plMessage/plAngularVelocityMsg.h" #include "plDrawable/plDrawableGenerator.h" diff --git a/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt index 12fbee36..63bb4fdf 100644 --- a/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories("../../PubUtilLib") set(plVault_SOURCES plDniCoordinateInfo.cpp - plVault.cpp plVaultClientApi.cpp plVaultConstants.cpp plVaultNodeAccess.cpp diff --git a/Sources/Plasma/PubUtilLib/plVault/plVault.cpp b/Sources/Plasma/PubUtilLib/plVault/plVault.cpp deleted file mode 100644 index 7595643c..00000000 --- a/Sources/Plasma/PubUtilLib/plVault/plVault.cpp +++ /dev/null @@ -1,50 +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==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/PubUtilLib/plVault/plVault.cpp -* -***/ - -#include "Pch.h" -#pragma hdrstop -