Skip to content

Commit 4ccc0bc

Browse files
committed
Added material to particles which were missing a material.
Modified app id from opengoggles to osvr.
1 parent 40df837 commit 4ccc0bc

1 file changed

Lines changed: 66 additions & 3 deletions

File tree

OSVR-Unity/Assets/OSVRUnity/Sample/UntrackedVRDisplayDemo.unity

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ ParticleSystemRenderer:
104104
m_LightmapIndex: 255
105105
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
106106
m_Materials:
107-
- {fileID: 2100000, guid: fb0573bb596274bd5bb7de63816cf101, type: 2}
107+
- {fileID: 2100000, guid: 6e645f023b55516478a849809e38d9ac, type: 2}
108108
m_SubsetIndices:
109109
m_StaticBatchRoot: {fileID: 0}
110110
m_UseLightProbes: 0
@@ -1230,7 +1230,7 @@ MonoBehaviour:
12301230
m_Script: {fileID: 11500000, guid: e2550bc6af558044baf4aa2ee88d5e8b, type: 3}
12311231
m_Name:
12321232
m_EditorClassIdentifier:
1233-
AppID: org.opengoggles.osvr-unity.sample.untrackeddisplay
1233+
AppID: org.osvr-unity.sample.untrackeddisplay
12341234
--- !u!4 &917069209
12351235
Transform:
12361236
m_ObjectHideFlags: 0
@@ -1403,7 +1403,7 @@ Prefab:
14031403
objectReference: {fileID: 0}
14041404
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
14051405
propertyPath: AppID
1406-
value: org.opengoggles.osvr-unity.sample.untrackeddisplay
1406+
value: org.osvr-unity.sample.untrackeddisplay
14071407
objectReference: {fileID: 0}
14081408
m_RemovedComponents: []
14091409
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
@@ -1452,6 +1452,69 @@ Transform:
14521452
m_Children: []
14531453
m_Father: {fileID: 955452066}
14541454
m_RootOrder: 0
1455+
--- !u!1 &1652852721
1456+
GameObject:
1457+
m_ObjectHideFlags: 0
1458+
m_PrefabParentObject: {fileID: 0}
1459+
m_PrefabInternal: {fileID: 0}
1460+
serializedVersion: 4
1461+
m_Component:
1462+
- 4: {fileID: 1652852723}
1463+
- 108: {fileID: 1652852722}
1464+
m_Layer: 0
1465+
m_Name: Directional light
1466+
m_TagString: Untagged
1467+
m_Icon: {fileID: 0}
1468+
m_NavMeshLayer: 0
1469+
m_StaticEditorFlags: 0
1470+
m_IsActive: 1
1471+
--- !u!108 &1652852722
1472+
Light:
1473+
m_ObjectHideFlags: 0
1474+
m_PrefabParentObject: {fileID: 0}
1475+
m_PrefabInternal: {fileID: 0}
1476+
m_GameObject: {fileID: 1652852721}
1477+
m_Enabled: 1
1478+
serializedVersion: 3
1479+
m_Type: 1
1480+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1481+
m_Intensity: .5
1482+
m_Range: 10
1483+
m_SpotAngle: 30
1484+
m_CookieSize: 10
1485+
m_Shadows:
1486+
m_Type: 0
1487+
m_Resolution: -1
1488+
m_Strength: 1
1489+
m_Bias: .0500000007
1490+
m_Softness: 4
1491+
m_SoftnessFade: 1
1492+
m_Cookie: {fileID: 0}
1493+
m_DrawHalo: 0
1494+
m_ActuallyLightmapped: 0
1495+
m_Flare: {fileID: 0}
1496+
m_RenderMode: 0
1497+
m_CullingMask:
1498+
serializedVersion: 2
1499+
m_Bits: 4294967295
1500+
m_Lightmapping: 1
1501+
m_ShadowSamples: 1
1502+
m_ShadowRadius: 0
1503+
m_ShadowAngle: 0
1504+
m_IndirectIntensity: 1
1505+
m_AreaSize: {x: 1, y: 1}
1506+
--- !u!4 &1652852723
1507+
Transform:
1508+
m_ObjectHideFlags: 0
1509+
m_PrefabParentObject: {fileID: 0}
1510+
m_PrefabInternal: {fileID: 0}
1511+
m_GameObject: {fileID: 1652852721}
1512+
m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381661, w: .875426114}
1513+
m_LocalPosition: {x: 0, y: 0, z: 0}
1514+
m_LocalScale: {x: 1, y: 1, z: 1}
1515+
m_Children: []
1516+
m_Father: {fileID: 0}
1517+
m_RootOrder: 3
14551518
--- !u!1 &2061423055
14561519
GameObject:
14571520
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)