Merge pull request #183 from Deledrius/plWarpMsg

Add plWarpMsg and pyWarpMsg.

Python/CMakeLists.txt

@@ -390,6 +390,7 @@ set(PRP_MSG_SOURCES
     PRP/Message/pySubWorldMsg.cpp
     PRP/Message/pySwimMsg.cpp
     PRP/Message/pyTimerCallbackMsg.cpp
+    PRP/Message/pyWarpMsg.cpp
     PRP/Message/pyVariableEventData.cpp
 )
 set(PRP_MSG_HEADERS
@@ -412,6 +413,7 @@ set(PRP_MSG_HEADERS
     PRP/Message/pySwimMsg.h
     PRP/Message/pyResponderMsg.h
     PRP/Message/pyTimerCallbackMsg.h
+    PRP/Message/pyWarpMsg.h
 )
 
 set(PRP_MISC_SOURCES

Python/Module.cpp

@@ -127,6 +127,7 @@
 #include "PRP/Message/pySoundMsg.h"
 #include "PRP/Message/pySwimMsg.h"
 #include "PRP/Message/pyTimerCallbackMsg.h"
+#include "PRP/Message/pyWarpMsg.h"
 #include "PRP/Misc/pyRenderLevel.h"
 #include "PRP/Misc/pyAgeLinkInfo.h"
 #include "PRP/Misc/pyFogEnvironment.h"
@@ -891,6 +892,7 @@ PyMODINIT_FUNC initPyHSPlasma()
     PyModule_AddObject(module, "plMessageWithCallbacks", Init_pyMessageWithCallbacks_Type());
     PyModule_AddObject(module, "plAnimCmdMsg", Init_pyAnimCmdMsg_Type());
     PyModule_AddObject(module, "plTimerCallbackMsg", Init_pyTimerCallbackMsg_Type());
+    PyModule_AddObject(module, "plWarpMsg", Init_pyWarpMsg_Type());
     PyModule_AddObject(module, "plEnableMsg", Init_pyEnableMsg_Type());
     PyModule_AddObject(module, "plExcludeRegionMsg", Init_pyExcludeRegionMsg_Type());
     PyModule_AddObject(module, "plVolumeIsect", Init_pyVolumeIsect_Type());

Python/PRP/Message/pyWarpMsg.cpp

@@ -0,0 +1,51 @@
+/* This file is part of HSPlasma.
+ *
+ * HSPlasma 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.
+ *
+ * HSPlasma 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 HSPlasma.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pyWarpMsg.h"
+
+#include <PRP/Message/plWarpMsg.h>
+#include "Math/pyMatrix.h"
+#include "pyMessage.h"
+
+PY_PLASMA_NEW(WarpMsg, plWarpMsg)
+
+PY_PROPERTY(uint32_t, WarpMsg, warpFlags, getWarpFlags, setWarpFlags)
+PY_PROPERTY(hsMatrix44, WarpMsg, transform, getTransform, setTransform)
+
+static PyGetSetDef pyWarpMsg_GetSet[] = {
+    pyWarpMsg_warpFlags_getset,
+    pyWarpMsg_transform_getset,
+    PY_GETSET_TERMINATOR
+};
+
+PY_PLASMA_TYPE(WarpMsg, plWarpMsg, "plWarpMsg wrapper")
+
+PY_PLASMA_TYPE_INIT(WarpMsg)
+{
+    pyWarpMsg_Type.tp_new = pyWarpMsg_new;
+    pyWarpMsg_Type.tp_getset = pyWarpMsg_GetSet;
+    pyWarpMsg_Type.tp_base = &pyMessage_Type;
+    if (PyType_CheckAndReady(&pyWarpMsg_Type) < 0)
+        return nullptr;
+
+    PY_TYPE_ADD_CONST(WarpMsg, "kFlushTransform", plWarpMsg::kFlushTransform);
+    PY_TYPE_ADD_CONST(WarpMsg, "kZeroVelocity", plWarpMsg::kZeroVelocity);
+
+    Py_INCREF(&pyWarpMsg_Type);
+    return (PyObject*)&pyWarpMsg_Type;
+}
+
+PY_PLASMA_IFC_METHODS(WarpMsg, plWarpMsg)

Python/PRP/Message/pyWarpMsg.h

@@ -0,0 +1,24 @@
+/* This file is part of HSPlasma.
+ *
+ * HSPlasma 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.
+ *
+ * HSPlasma 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 HSPlasma.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _PYWARPMSG_H
+#define _PYWARPMSG_H
+
+#include "PyPlasma.h"
+
+PY_WRAP_PLASMA(WarpMsg, class plWarpMsg);
+
+#endif

Python/PRP/pyCreatableConvert.cpp

@@ -112,6 +112,7 @@
 #include "PRP/Message/plSwimMsg.h"
 #include "PRP/Message/plTimerCallbackMsg.h"
 #include "PRP/Message/plTransitionMsg.h"
+#include "PRP/Message/plWarpMsg.h"
 #include "PRP/Misc/plFogEnvironment.h"
 #include "PRP/Modifier/plAliasModifier.h"
 #include "PRP/Modifier/plAnimEventModifier.h"
@@ -251,6 +252,7 @@
 #include "PRP/Message/pySoundMsg.h"
 #include "PRP/Message/pySwimMsg.h"
 #include "PRP/Message/pyTimerCallbackMsg.h"
+#include "PRP/Message/pyWarpMsg.h"
 #include "PRP/Misc/pyRenderLevel.h"
 #include "PRP/Misc/pyAgeLinkInfo.h"
 #include "PRP/Misc/pyFogEnvironment.h"
@@ -605,6 +607,7 @@ PyObject* ICreate(plCreatable* pCre)
         case kActivePrintShape: return pyActivePrintShape_FromActivePrintShape(plActivePrintShape::Convert(pCre));
         case kSimSuppressMsg: return pySimSuppressMsg_FromSimSuppressMsg(plSimSuppressMsg::Convert(pCre));
         case kGrassShaderMod: return pyGrassShaderMod_FromGrassShaderMod(plGrassShaderMod::Convert(pCre));
+        case kWarpMsg: return pyWarpMsg_FromWarpMsg(plWarpMsg::Convert(pCre));
         default:
             // many messages are not implemented, make sure they are at least a plMessage
             if (pCre->ClassInstance(kMessage))

core/CMakeLists.txt

@@ -336,6 +336,7 @@ set(PRP_MSG_SOURCES
     PRP/Message/plSwimMsg.cpp
     PRP/Message/plTimerCallbackMsg.cpp
     PRP/Message/plTransitionMsg.cpp
+    PRP/Message/plWarpMsg.cpp
     PRP/Message/proEventData.cpp
 )
 set(PRP_MSG_HEADERS
@@ -373,6 +374,7 @@ set(PRP_MSG_HEADERS
     PRP/Message/plSwimMsg.h
     PRP/Message/plTimerCallbackMsg.h
     PRP/Message/plTransitionMsg.h
+    PRP/Message/plWarpMsg.h
     PRP/Message/proEventData.h
 )
 

core/PRP/Message/plWarpMsg.cpp

@@ -0,0 +1,56 @@
+/* This file is part of HSPlasma.
+ *
+ * HSPlasma 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.
+ *
+ * HSPlasma 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 HSPlasma.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plWarpMsg.h"
+
+void plWarpMsg::read(hsStream* S, plResManager* mgr)
+{
+    plMessage::read(S, mgr);
+
+    fTransform.read(S);
+    fWarpFlags = S->readInt();
+}
+
+void plWarpMsg::write(hsStream* S, plResManager* mgr)
+{
+    plMessage::write(S, mgr);
+
+    fTransform.write(S);
+    S->writeInt(fWarpFlags);
+}
+
+void plWarpMsg::IPrcWrite(pfPrcHelper* prc)
+{
+    plMessage::IPrcWrite(prc);
+
+    prc->startTag("WarpParams");
+    prc->writeParamHex("Flags", fWarpFlags);
+    prc->endTag(true);
+    prc->writeSimpleTag("WarpTo");
+    fTransform.prcWrite(prc);
+    prc->closeTag();
+}
+
+void plWarpMsg::IPrcParse(const pfPrcTag* tag, plResManager* mgr)
+{
+    if (tag->getName() == "WarpParams") {
+        fWarpFlags = tag->getParam("Flags", "0").to_uint();
+    } else if (tag->getName() == "WarpTo") {
+        fTransform.prcParse(tag->getFirstChild());
+    } else {
+        plMessage::IPrcParse(tag, mgr);
+    }
+}

core/PRP/Message/plWarpMsg.h

@@ -0,0 +1,51 @@
+/* This file is part of HSPlasma.
+ *
+ * HSPlasma 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.
+ *
+ * HSPlasma 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 HSPlasma.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _PLWARPMSG_H
+#define _PLWARPMSG_H
+
+#include "plMessage.h"
+#include "Math/hsMatrix44.h"
+
+class PLASMA_DLL plWarpMsg : public plMessage
+{
+    CREATABLE(plWarpMsg, kWarpMsg, plMessage)
+
+public:
+    enum { kFlushTransform = 0x1, kZeroVelocity = 0x2 };
+
+private:
+    uint32_t fWarpFlags;
+    hsMatrix44 fTransform;
+
+public:
+    plWarpMsg() : fWarpFlags(), fTransform() { }
+
+    uint32_t getWarpFlags() const { return fWarpFlags; }
+    void setWarpFlags(uint32_t f) { fWarpFlags = f; }
+
+    hsMatrix44 getTransform() { return fTransform; }
+    void setTransform(const hsMatrix44& mat) { fTransform = mat; }
+
+    void read(hsStream* S, plResManager* mgr) HS_OVERRIDE;
+    void write(hsStream* S, plResManager* mgr) HS_OVERRIDE;
+
+protected:
+    void IPrcWrite(pfPrcHelper* prc) HS_OVERRIDE;
+    void IPrcParse(const pfPrcTag* tag, plResManager* mgr) HS_OVERRIDE;
+};
+
+#endif

core/ResManager/plFactory.cpp

@@ -110,6 +110,7 @@
 #include "PRP/Message/plSwimMsg.h"
 #include "PRP/Message/plTimerCallbackMsg.h"
 #include "PRP/Message/plTransitionMsg.h"
+#include "PRP/Message/plWarpMsg.h"
 #include "PRP/Misc/plFogEnvironment.h"
 #include "PRP/Modifier/plAliasModifier.h"
 #include "PRP/Modifier/plAnimEventModifier.h"
@@ -647,7 +648,7 @@ plCreatable* plFactory::Create(short typeIdx)
         //case kSpawnRequestMsg: return new plSpawnRequestMsg();
         case kLoadCloneMsg: return new plLoadCloneMsg();
         case kEnableMsg: return new plEnableMsg();
-        //case kWarpMsg: return new plWarpMsg();
+        case kWarpMsg: return new plWarpMsg();
         //case kAttachMsg: return new plAttachMsg();
         //case kConsole: return new pfConsole();
         //case kRenderMsg: return new plRenderMsg();