Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d781ebe

Browse files
coolcatcodercoolcatcoder
committed
simple fixing of scenes
updated scenes to work with new changes
1 parent 45e2b88 commit d781ebe

File tree

3 files changed

+41
-23
lines changed

3 files changed

+41
-23
lines changed

‎Assets/Scenes/SampleScene.unity

+34-9
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ MonoBehaviour:
392392
ShapeMysteryPower: 0
393393
Dynamic: 1
394394
Trigger: 0
395+
TriMesh: {fileID: 0}
395396
--- !u!23 &342538473
396397
MeshRenderer:
397398
m_ObjectHideFlags: 0
@@ -479,6 +480,7 @@ MonoBehaviour:
479480
ShapeMysteryPower: 0
480481
Dynamic: 1
481482
Trigger: 0
483+
TriMesh: {fileID: 0}
482484
--- !u!23 &429544491
483485
MeshRenderer:
484486
m_ObjectHideFlags: 0
@@ -706,6 +708,7 @@ MonoBehaviour:
706708
ShapeMysteryPower: 0
707709
Dynamic: 1
708710
Trigger: 0
711+
TriMesh: {fileID: 0}
709712
--- !u!23 &589655020
710713
MeshRenderer:
711714
m_ObjectHideFlags: 0
@@ -905,6 +908,7 @@ MonoBehaviour:
905908
ShapeMysteryPower: 0
906909
Dynamic: 1
907910
Trigger: 0
911+
TriMesh: {fileID: 0}
908912
--- !u!23 &590330737
909913
MeshRenderer:
910914
m_ObjectHideFlags: 0
@@ -992,6 +996,7 @@ MonoBehaviour:
992996
ShapeMysteryPower: 0
993997
Dynamic: 1
994998
Trigger: 0
999+
TriMesh: {fileID: 0}
9951000
--- !u!23 &613085899
9961001
MeshRenderer:
9971002
m_ObjectHideFlags: 0
@@ -1254,6 +1259,7 @@ MonoBehaviour:
12541259
ShapeMysteryPower: 0
12551260
Dynamic: 1
12561261
Trigger: 0
1262+
TriMesh: {fileID: 0}
12571263
--- !u!23 &1036192931
12581264
MeshRenderer:
12591265
m_ObjectHideFlags: 0
@@ -1343,6 +1349,7 @@ GameObject:
13431349
- component: {fileID: 1143146134}
13441350
- component: {fileID: 1143146136}
13451351
- component: {fileID: 1143146135}
1352+
- component: {fileID: 1143146137}
13461353
m_Layer: 0
13471354
m_Name: Fluid Render Test
13481355
m_TagString: Untagged
@@ -6144,6 +6151,20 @@ ParticleSystem:
61446151
m_PostInfinity: 2
61456152
m_RotationOrder: 4
61466153
vectorLabel1_3: W
6154+
--- !u!114 &1143146137
6155+
MonoBehaviour:
6156+
m_ObjectHideFlags: 0
6157+
m_CorrespondingSourceObject: {fileID: 0}
6158+
m_PrefabInstance: {fileID: 0}
6159+
m_PrefabAsset: {fileID: 0}
6160+
m_GameObject: {fileID: 1143146133}
6161+
m_Enabled: 1
6162+
m_EditorHideFlags: 0
6163+
m_Script: {fileID: 11500000, guid: 2a4ec1d7780aa154cb8b057dd41513bc, type: 3}
6164+
m_Name:
6165+
m_EditorClassIdentifier:
6166+
Container: {fileID: 1205042146}
6167+
FluidRenderer: {fileID: 1143146136}
61476168
--- !u!1 &1164514113
61486169
GameObject:
61496170
m_ObjectHideFlags: 0
@@ -6293,6 +6314,7 @@ MonoBehaviour:
62936314
ShapeMysteryPower: 0
62946315
Dynamic: 1
62956316
Trigger: 0
6317+
TriMesh: {fileID: 0}
62966318
--- !u!23 &1164514119
62976319
MeshRenderer:
62986320
m_ObjectHideFlags: 0
@@ -6374,15 +6396,6 @@ MonoBehaviour:
63746396
m_EditorClassIdentifier:
63756397
MaxParticles: 100000
63766398
MaxDiffuseParticles: 0
6377-
emitters:
6378-
- {fileID: 1907235147}
6379-
FluidRenderer: {fileID: 1143146136}
6380-
ParticleColour:
6381-
serializedVersion: 2
6382-
rgba: 4290110740
6383-
TrackingColour:
6384-
serializedVersion: 2
6385-
rgba: 4290110740
63866399
RParticleRadius: 0.5
63876400
Substeps: 1
63886401
Plane0Index0: 0
@@ -6506,6 +6519,8 @@ MonoBehaviour:
65066519
numPlanes: 0
65076520
relaxationMode: 1
65086521
relaxationFactor: 1
6522+
SlotsUsed: 0
6523+
CurrentSlot: 0
65096524
--- !u!4 &1205042147
65106525
Transform:
65116526
m_ObjectHideFlags: 0
@@ -6628,6 +6643,7 @@ MonoBehaviour:
66286643
ShapeMysteryPower: 0
66296644
Dynamic: 1
66306645
Trigger: 0
6646+
TriMesh: {fileID: 0}
66316647
--- !u!114 &1569541152
66326648
MonoBehaviour:
66336649
m_ObjectHideFlags: 0
@@ -6903,6 +6919,7 @@ MonoBehaviour:
69036919
ShapeMysteryPower: 0
69046920
Dynamic: 1
69056921
Trigger: 0
6922+
TriMesh: {fileID: 0}
69066923
--- !u!23 &1689357605
69076924
MeshRenderer:
69086925
m_ObjectHideFlags: 0
@@ -6990,6 +7007,7 @@ MonoBehaviour:
69907007
ShapeMysteryPower: 0
69917008
Dynamic: 1
69927009
Trigger: 0
7010+
TriMesh: {fileID: 0}
69937011
--- !u!23 &1744446867
69947012
MeshRenderer:
69957013
m_ObjectHideFlags: 0
@@ -7108,6 +7126,7 @@ MonoBehaviour:
71087126
ShapeMysteryPower: 0
71097127
Dynamic: 1
71107128
Trigger: 0
7129+
TriMesh: {fileID: 0}
71117130
--- !u!23 &1905825068
71127131
MeshRenderer:
71137132
m_ObjectHideFlags: 0
@@ -7313,6 +7332,7 @@ MonoBehaviour:
73137332
m_Script: {fileID: 11500000, guid: e0299f55aee432343987aefbcbc6995b, type: 3}
73147333
m_Name:
73157334
m_EditorClassIdentifier:
7335+
Container: {fileID: 1205042146}
73167336
ParticlesPerTime: 65
73177337
SecondsBetween: 0.1
73187338
SecondsTillStop: 10
@@ -7322,6 +7342,11 @@ MonoBehaviour:
73227342
VelocityZ: 0
73237343
Spread: 20
73247344
InverseMass: 1
7345+
Colours:
7346+
- serializedVersion: 2
7347+
rgba: 14148140
7348+
- serializedVersion: 2
7349+
rgba: 13576903
73257350
debug: 0
73267351
--- !u!4 &1907235148
73277352
Transform:

‎Assets/Scenes/pond_testing.unity

+1-4
Original file line numberDiff line numberDiff line change
@@ -851,9 +851,6 @@ MonoBehaviour:
851851
m_EditorClassIdentifier:
852852
MaxParticles: 100000
853853
MaxDiffuseParticles: 0
854-
emitters:
855-
- {fileID: 1857817460}
856-
FluidRenderer: {fileID: 1663408939}
857854
RParticleRadius: 0.5
858855
Substeps: 2
859856
Plane0Index0: 0
@@ -6680,7 +6677,7 @@ MonoBehaviour:
66806677
Container: {fileID: 886319215}
66816678
ParticlesPerTime: 7
66826679
SecondsBetween: 0.03
6683-
SecondsTillStop: 100
6680+
SecondsTillStop: Infinity
66846681
emit: 0
66856682
VelocityX: 0
66866683
VelocityY: 15

‎Assets/Scripts/FlexStuff/FlexContainer.cs

+6-10
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ public class FlexContainer : MonoBehaviour
1616

1717
public int MaxParticles = 1000;
1818
public int MaxDiffuseParticles = 0;
19-
public List<FlexEmitter> emitters;
20-
public ParticleSystem FluidRenderer;
2119
[System.NonSerialized]
2220
public Color32[] ParticleColours;
23-
//public Color32 TrackingColour;
24-
//public float InverseParticleMass = 1;
2521
public float RParticleRadius = 0.15f;
2622
public int Substeps = 1;
2723

@@ -86,17 +82,17 @@ public class FlexContainer : MonoBehaviour
8682
unsafe NvFlexSolver* solver;
8783
public NvFlexParams SolverParams;
8884

89-
unsafe NvFlexBuffer* particleBuffer;
90-
unsafe NvFlexBuffer* velocityBuffer;
91-
unsafe NvFlexBuffer* phaseBuffer;
85+
//unsafe NvFlexBuffer* particleBuffer;
86+
//unsafe NvFlexBuffer* velocityBuffer;
87+
//unsafe NvFlexBuffer* phaseBuffer;
9288
unsafe NvFlexBuffer* geometryBuffer;
9389
unsafe NvFlexBuffer* positionsBuffer;
9490
unsafe NvFlexBuffer* rotationsBuffer;
9591
unsafe NvFlexBuffer* flagsBuffer;
9692

97-
public unsafe Vector4* particles;
98-
public unsafe Vector3* velocities;
99-
public unsafe int* phases;
93+
//public unsafe Vector4* particles;
94+
//public unsafe Vector3* velocities;
95+
//public unsafe int* phases;
10096
unsafe NvFlexCollisionGeometry* geometry;
10197
unsafe Vector4* positions;
10298
unsafe XQuat<float>* rotations;

0 commit comments

Comments
 (0)