Skip to content

Commit

Permalink
Merge pull request #16 from gelic-idealab/release/v0.1.1-alpha
Browse files Browse the repository at this point in the history 
Release/v0.1.1 alpha
  • Loading branch information
@parseccentric
parseccentric authored Jan 24, 2022
2 parents fe38467 + 87274f0 commit 4c37ec9
Show file tree
Hide file tree
Showing 6 changed files with 560 additions and 164 deletions.
25 changes: 17 additions & 8 deletions KOMODO-IMPRESS/Assets/IMPRESS/Prefab/WorldPulling.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: debdd6d91d87b624d876090dcc21992a, type: 3}
m_Name:
m_EditorClassIdentifier:
scaleMin: 0.835
scaleMax: 1.94
scaleMin: 0.1
scaleMax: 10
debugAxes: {fileID: 7500337663012258881, guid: 2d19101d6d3ac6c438d33c092cc080b1,
type: 3}
initialPlayspacePosition: {x: 0, y: 0, z: 0}
showDebugAxes: 0
initialLeftEyePosition: {x: 0, y: 0, z: 0}
animalRulerMesh: {fileID: 1128748475593155725}
animalRuler: {fileID: 1149998305953642101}
physicalFloor: {fileID: 0}
Expand All @@ -112,14 +113,22 @@ MonoBehaviour:
hands:
- {fileID: 0}
- {fileID: 0}
pivotPointsParent: {fileID: 0}
pivotPoint0: {fileID: 0}
doUpdateInitialValues: 0
currentPivotPointInPlayspace: {fileID: 0}
player: {fileID: 0}
xrPlayer: {fileID: 0}
leftEye: {fileID: 0}
playspace: {fileID: 0}
teleportPlayer: {fileID: 0}
initialPlayerRotation: {x: 0, y: 0, z: 0, w: 0}
initialPlayspacePosition: {x: 0, y: 0, z: 0}
initialPlayspaceRotation: {x: 0, y: 0, z: 0, w: 0}
initialScale: 1
materials:
- {fileID: 2100000, guid: e23af2a5280618c49a2340fdfba771e6, type: 2}
- {fileID: 2100000, guid: 8e3029c485da38b46b52bcdb96b9de7a, type: 2}
- {fileID: 2100000, guid: 02fef1dbd624dcc4d9c9ab88a7e922d4, type: 2}
- {fileID: 2100000, guid: d7589b41c4f527c44af461d54cf01d52, type: 2}
- {fileID: 2100000, guid: 093e7be84ebdb7940ba941aee252cbf9, type: 2}
- {fileID: 2100000, guid: 1bf2a636382de314d883fcb85d081587, type: 2}
- {fileID: 2100000, guid: 381fb7f0084fa1d4982d467aa0d80e0a, type: 2}
--- !u!120 &4935357643860465841
LineRenderer:
m_ObjectHideFlags: 0
Expand Down
20 changes: 20 additions & 0 deletions KOMODO-IMPRESS/Assets/IMPRESS/Scene/Main.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3448,6 +3448,26 @@ PrefabInstance:
propertyPath: hands.Array.data[1]
value:
objectReference: {fileID: 8472804883547595920}
- target: {fileID: 4935357643860465840, guid: 85334d0d9069bb546bb3379686af011c,
type: 3}
propertyPath: debugAxesMaterials.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4935357643860465840, guid: 85334d0d9069bb546bb3379686af011c,
type: 3}
propertyPath: debugAxesMaterials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7e237e86216b037488af65c67187dc08, type: 2}
- target: {fileID: 4935357643860465840, guid: 85334d0d9069bb546bb3379686af011c,
type: 3}
propertyPath: debugAxesMaterials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 8e3029c485da38b46b52bcdb96b9de7a, type: 2}
- target: {fileID: 4935357643860465840, guid: 85334d0d9069bb546bb3379686af011c,
type: 3}
propertyPath: debugAxesMaterials.Array.data[2]
value:
objectReference: {fileID: 2100000, guid: 02fef1dbd624dcc4d9c9ab88a7e922d4, type: 2}
- target: {fileID: 4935357643860465854, guid: 85334d0d9069bb546bb3379686af011c,
type: 3}
propertyPath: m_Name
Expand Down
194 changes: 192 additions & 2 deletions KOMODO-IMPRESS/Assets/IMPRESS/Scene/OutsideTheMilkyWay.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,196 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1186417695
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1186417699}
- component: {fileID: 1186417698}
- component: {fileID: 1186417697}
- component: {fileID: 1186417696}
m_Layer: 0
m_Name: Sphere_Test (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!135 &1186417696
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186417695}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1186417697
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186417695}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3ee727b154ed24e44812c316bb01ef90, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1186417698
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186417695}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1186417699
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186417695}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.78, y: 1.02, z: 1.03}
m_LocalScale: {x: 0.5, y: 0.17, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1275368507
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1275368511}
- component: {fileID: 1275368510}
- component: {fileID: 1275368509}
- component: {fileID: 1275368508}
m_Layer: 0
m_Name: Sphere_Test (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!135 &1275368508
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275368507}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1275368509
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275368507}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3ee727b154ed24e44812c316bb01ef90, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1275368510
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275368507}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1275368511
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275368507}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.29, y: 1.08, z: 1.85}
m_LocalScale: {x: 1, y: 0.39, z: 1.69}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1531216788
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -236,7 +426,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!135 &1531216789
SphereCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -307,7 +497,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531216788}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.35, y: -0.89, z: -1.89}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand Down
Loading

0 comments on commit 4c37ec9

Please sign in to comment.