From c3c74b46a4d10982c54fbdb093f3c9a6d24b5304 Mon Sep 17 00:00:00 2001
From: bloeys <bloeys@outlook.com>
Date: Mon, 17 Jan 2022 19:37:00 +0400
Subject: [PATCH] PvdSceneClient

---
 main.go                         |   7 +++++++
 pgo/libs/libphysx-c.a           | Bin 6430 -> 8944 bytes
 pgo/pgo.go                      |  27 +++++++++++++++++++++++++-
 pgo/physx-c/CPxActor.h          |  19 ++++++++++++++++++
 pgo/physx-c/CPxMaterial.h       |  19 ++++++++++++++++++
 pgo/physx-c/CPxPhysics.h        |   2 ++
 pgo/physx-c/CPxPlane.h          |  20 +++++++++++++++++++
 pgo/physx-c/CPxPvdSceneClient.h |  33 ++++++++++++++++++++++++++++++++
 pgo/physx-c/CPxRigidStatic.h    |  25 ++++++++++++++++++++++++
 pgo/physx-c/CPxScene.h          |   6 ++++++
 pgo/wrap.cxx                    |   4 ++++
 11 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100755 pgo/physx-c/CPxActor.h
 create mode 100755 pgo/physx-c/CPxMaterial.h
 create mode 100755 pgo/physx-c/CPxPlane.h
 create mode 100755 pgo/physx-c/CPxPvdSceneClient.h
 create mode 100755 pgo/physx-c/CPxRigidStatic.h

diff --git a/main.go b/main.go
index 14f919f..7819393 100755
--- a/main.go
+++ b/main.go
@@ -26,6 +26,13 @@ func main() {
 	s := p.CreateScene(sd)
 	println("Scene:", s)
 
+	scenePvdClient := s.GetScenePvdClient()
+	println("ScenePvdClient:", scenePvdClient)
+
+	scenePvdClient.SetScenePvdFlag(pgo.PvdSceneFlag_eTRANSMIT_CONSTRAINTS, true)
+	scenePvdClient.SetScenePvdFlag(pgo.PvdSceneFlag_eTRANSMIT_CONTACTS, true)
+	scenePvdClient.SetScenePvdFlag(pgo.PvdSceneFlag_eTRANSMIT_SCENEQUERIES, true)
+
 	for {
 
 	}
diff --git a/pgo/libs/libphysx-c.a b/pgo/libs/libphysx-c.a
index b42540ab3e191cbbc3ca065e5a0317f76a68342b..cac0d89ef1fbacd6987439e31fe469097bb2becd 100755
GIT binary patch
literal 8944
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

delta 1024
zcmaKrT}V@57{{N@?acR_vz=|{Y&&zF=H^G3m7zr$L_tP%qi%r~2`#3y%u?v0!pMuF
zs3^jJbUD0=F1!#7yQoA6BFoD@Ec*cQLMSV|C?unvvqjKNgCFmn=l{OX`#k@>`?@RN
zaHDCkv9Y0|@X5$Tw2nw#BJ!3K`O-w%NRhxikxejDB+$b#qvwkFlSDS5{2v;4WddB%
z#+WD)T;TIec%?|Br<o|ig~EJ!fs4E{k(nYU>o!J95&aEc$oPkfnB%OELsmE8b0CUN
zwGtUMghgS(@2wfz;S>%$EIEdx6~u(=I4--Z@jwZnUz5h_q@)8kWC_<iLxYVQ|Jq=3
z!%N&xxtA#IBO1|&=6Q-tkf?{(oKBSV6Xioh4U9eEgh8~x`bwDhMA$@LFETUyy_pNP
zu>OY64e_~gj@f5&k)Q~v<RLe;NaUkZ3R8%@q>#)tgQSt4bTY^!2RZ-Q{{P)2#70DM
zLeyhK+(AzE@t77WECW6zfi7ti&M5+Sl{lVD75Js>#UZr=&(vwG^^_v-QQ49JVxAzL
zxD579#U<Zr47=SpDn)RR8I?*QGz}@OZtS|Y)s3xjL!DGEysGBG?9mDx^o3F)bnn1a
z1*aUC3LOzouEgdnj+|%;r|~_ki{9F~7g5fXK#v?&ZcZPaS;LWwTyQu|d~kY@kF+Vn
zH5-=Ka^79YC(svCF&y21cGFPqKOTL(nKh}PMUipp__=Bu-kXMcWZ>@8de%I4ORe5Y
zB%&!XP{02rKUONmK(rnA%5-J4)B07(8Nnsa$tD)dQlkCp_Srb+WbBUZ!%Dd!ZoR#|
zP{kPqQR|raGIe<=#u1xkWd*IwezGGkmaSGytTNPhJ0Cr*<BZR~`mhw|o>EHge0ssQ
zNaKqJr81n1Z$o+52zFG3pWD9pdGpS;)BCdBn2hbQCGqx0)s!s-kVvF4o6tpPZEl(W
zpcKUSL{>>RZTV(TqjSl3{L`FGwpBGZTOax5@!N4xOZO?R*xsFOr2gEQlc(2Z*LU^y
GlKdO>JK~%G

diff --git a/pgo/pgo.go b/pgo/pgo.go
index ed7d090..0ed7e1e 100755
--- a/pgo/pgo.go
+++ b/pgo/pgo.go
@@ -24,6 +24,10 @@ struct CPxPhysics* CPxCreatePhysics(struct CPxFoundation* cfoundation, struct CP
 struct CPxScene* CPxPhysics_createScene(struct CPxPhysics*, struct CPxSceneDesc*);
 void CPxPhysics_release(struct CPxPhysics*);
 
+struct CPxPvdSceneClient* CPxScene_getScenePvdClient(struct CPxScene*);
+
+void CPxPvdSceneClient_setScenePvdFlag(struct CPxPvdSceneClient* c, enum CPxPvdSceneFlag flag, bool value);
+
 struct CPxVec3 NewCPxVec3(float x, float y, float z);
 
 struct CPxDefaultCpuDispatcher* CPxDefaultCpuDispatcherCreate(CPxU32 numThreads, CPxU32 affinityMasks);
@@ -111,11 +115,16 @@ type Scene struct {
 	cS *C.struct_CPxScene
 }
 
+func (s *Scene) GetScenePvdClient() *PvdSceneClient {
+	return &PvdSceneClient{
+		cPvdSceneClient: C.CPxScene_getScenePvdClient(s.cS),
+	}
+}
+
 type Physics struct {
 	cPhysics *C.struct_CPxPhysics
 }
 
-// struct CPxScene* CPxPhysics_createScene(struct CPxPhysics*, struct CPxSceneDesc*);
 func (p *Physics) CreateScene(sd *SceneDesc) *Scene {
 	return &Scene{
 		cS: C.CPxPhysics_createScene(p.cPhysics, sd.cSD),
@@ -181,3 +190,19 @@ func NewSceneDesc(ts *TolerancesScale) *SceneDesc {
 		cSD: C.NewCPxSceneDesc(ts.cTolScale),
 	}
 }
+
+type PvdSceneFlag uint32
+
+const (
+	PvdSceneFlag_eTRANSMIT_CONTACTS     PvdSceneFlag = (1 << 0) //Transmits contact stream to PVD.
+	PvdSceneFlag_eTRANSMIT_SCENEQUERIES PvdSceneFlag = (1 << 1) //Transmits scene query stream to PVD.
+	PvdSceneFlag_eTRANSMIT_CONSTRAINTS  PvdSceneFlag = (1 << 2) //Transmits constraints visualize stream to PVD.
+)
+
+type PvdSceneClient struct {
+	cPvdSceneClient *C.struct_CPxPvdSceneClient
+}
+
+func (p *PvdSceneClient) SetScenePvdFlag(flag PvdSceneFlag, value bool) {
+	C.CPxPvdSceneClient_setScenePvdFlag(p.cPvdSceneClient, uint32(flag), C._Bool(value))
+}
diff --git a/pgo/physx-c/CPxActor.h b/pgo/physx-c/CPxActor.h
new file mode 100755
index 0000000..e3afb09
--- /dev/null
+++ b/pgo/physx-c/CPxActor.h
@@ -0,0 +1,19 @@
+#ifndef CPxActor_H
+#define CPxActor_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	struct CPxActor
+	{
+		void* obj;
+	};
+
+	CPxAPI void CPxActor_release(CSTRUCT CPxActor*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !CPxActor_H
diff --git a/pgo/physx-c/CPxMaterial.h b/pgo/physx-c/CPxMaterial.h
new file mode 100755
index 0000000..8c4ef56
--- /dev/null
+++ b/pgo/physx-c/CPxMaterial.h
@@ -0,0 +1,19 @@
+#ifndef CPxMaterial_H
+#define CPxMaterial_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	struct CPxMaterial
+	{
+		void* obj;
+	};
+
+	CPxAPI void CPxMaterial_release(CSTRUCT CPxMaterial*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !CPxMaterial_H
diff --git a/pgo/physx-c/CPxPhysics.h b/pgo/physx-c/CPxPhysics.h
index 8eeb427..d2c4b80 100755
--- a/pgo/physx-c/CPxPhysics.h
+++ b/pgo/physx-c/CPxPhysics.h
@@ -5,6 +5,7 @@
 #include "CPxFoundation.h"
 #include "CPxScene.h"
 #include "CPxSceneDesc.h"
+#include "CPxMaterial.h"
 #include "CPxTolerancesScale.h"
 
 #ifdef __cplusplus
@@ -17,6 +18,7 @@ extern "C" {
 
 	CPxAPI CSTRUCT CPxPhysics* CPxCreatePhysics(CSTRUCT CPxFoundation* cfoundation, CSTRUCT CPxTolerancesScale cscale, bool trackOutstandingAllocations, CSTRUCT CPxPvd* cpvd);
 	CPxAPI CSTRUCT CPxScene* CPxPhysics_createScene(CSTRUCT CPxPhysics*, CSTRUCT CPxSceneDesc*);
+	CPxAPI CSTRUCT CPxMaterial* CPxPhysics_createMaterial(CSTRUCT CPxPhysics*, CPxReal staticFriction, CPxReal dynamicFriction, CPxReal restitution);
 	CPxAPI void CPxPhysics_release(CSTRUCT CPxPhysics*);
 
 #ifdef __cplusplus
diff --git a/pgo/physx-c/CPxPlane.h b/pgo/physx-c/CPxPlane.h
new file mode 100755
index 0000000..19382e2
--- /dev/null
+++ b/pgo/physx-c/CPxPlane.h
@@ -0,0 +1,20 @@
+#ifndef CPxPlane_H
+#define CPxPlane_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	struct CPxPlane
+	{
+		void* obj;
+	};
+
+	CPxAPI CSTRUCT CPxPlane* NewCPxPlane(float nx, float ny, float nz, float distance);
+	CPxAPI void CPxPlane_release(CSTRUCT CPxPlane*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !CPxPlane_H
diff --git a/pgo/physx-c/CPxPvdSceneClient.h b/pgo/physx-c/CPxPvdSceneClient.h
new file mode 100755
index 0000000..5a65296
--- /dev/null
+++ b/pgo/physx-c/CPxPvdSceneClient.h
@@ -0,0 +1,33 @@
+#ifndef CPxPvdSceneClient_H
+#define CPxPvdSceneClient_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	enum CPxPvdSceneFlag
+	{
+		CPxPvdSceneFlag_eTRANSMIT_CONTACTS = (1 << 0), //Transmits contact stream to PVD.
+		CPxPvdSceneFlag_eTRANSMIT_SCENEQUERIES = (1 << 1), //Transmits scene query stream to PVD.
+		CPxPvdSceneFlag_eTRANSMIT_CONSTRAINTS = (1 << 2)  //Transmits constraints visualize stream to PVD.
+	};
+
+	struct CPxPvdSceneClient
+	{
+		void* obj;
+	};
+
+	CPxAPI void CPxPvdSceneClient_setScenePvdFlag(CSTRUCT CPxPvdSceneClient* c, CENUM CPxPvdSceneFlag flag, bool value);
+
+	/// <summary>
+	/// This only releases the C struct
+	/// </summary>
+	/// <param name=""></param>
+	/// <returns></returns>
+	CPxAPI void CPxPvdSceneClient_release(CSTRUCT CPxPvdSceneClient*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !CPxPvdSceneClient_H
diff --git a/pgo/physx-c/CPxRigidStatic.h b/pgo/physx-c/CPxRigidStatic.h
new file mode 100755
index 0000000..6fd37d9
--- /dev/null
+++ b/pgo/physx-c/CPxRigidStatic.h
@@ -0,0 +1,25 @@
+#ifndef CPxRigidStatic_H
+#define CPxRigidStatic_H
+
+#include "CPxPhysics.h"
+#include "CPxPlane.h"
+#include "CPxMaterial.h"
+#include "CPxActor.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	struct CPxRigidStatic
+	{
+		void* obj;
+	};
+
+	CPxAPI CSTRUCT CPxRigidStatic* CPxCreatePlane(CSTRUCT CPxPhysics* sdk, CSTRUCT CPxPlane* plane, CSTRUCT CPxMaterial* material);
+	CPxAPI CSTRUCT CPxActor* CPxRigidStatic_toCPxActor(CSTRUCT CPxRigidStatic*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !CPxRigidStatic_H
diff --git a/pgo/physx-c/CPxScene.h b/pgo/physx-c/CPxScene.h
index deea264..d441619 100755
--- a/pgo/physx-c/CPxScene.h
+++ b/pgo/physx-c/CPxScene.h
@@ -1,6 +1,9 @@
 #ifndef CPxScene_H
 #define CPxScene_H
 
+#include "CPxPvdSceneClient.h"
+#include "CPxActor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -10,6 +13,9 @@ extern "C" {
 		void* obj;
 	};
 
+	CPxAPI CSTRUCT CPxPvdSceneClient* CPxScene_getScenePvdClient(CSTRUCT CPxScene*);
+	CPxAPI void CPxScene_addActor(CSTRUCT CPxScene*, CSTRUCT CPxActor* actor);
+
 	CPxAPI void CPxScene_release(CSTRUCT CPxScene*);
 
 #ifdef __cplusplus
diff --git a/pgo/wrap.cxx b/pgo/wrap.cxx
index 36265ec..ebf42a9 100755
--- a/pgo/wrap.cxx
+++ b/pgo/wrap.cxx
@@ -16,3 +16,7 @@
 #include <CPxSceneDesc.h>
 #include <CPxTolerancesScale.h>
 #include <CPxVec3.h>
+#include <CPxPlane.h>
+#include <CPxActor.h>
+#include <CPxRigidStatic.h>
+#include <CPxPvdSceneClient.h>