diff --git a/Assets/FactManager.cs b/Assets/FactManager.cs
index f0354211de47e4a0bdf4e8b68567bfa75ce7ac97..46ff94ac4f7e085314f0ac92afdbd173731cb45e 100644
--- a/Assets/FactManager.cs
+++ b/Assets/FactManager.cs
@@ -215,9 +215,13 @@ public void Rocket(RaycastHit hit)
public void SmallRocket(RaycastHit hit, int idA)
{
+ //enable collider to measure angle to the treetop
+
+
+
int idB = this.GetFirstEmptyID();
CommunicationEvents.AddFactEvent.Invoke(this.AddPointFact(hit, idB));
-
+ Facts[idB].Representation.GetComponentInChildren<Collider>().enabled = true;
//third point with unknown height
int idC = this.GetFirstEmptyID();
@@ -270,17 +274,17 @@ public void OnHit(RaycastHit hit)
CommunicationEvents.StartLineDrawingEvent.Invoke(this.lineModeFirstPointSelected);
}
}
- //If no Point was hit
- else if(Input.GetKey(KeyCode.LeftShift))
+ //if we want to spawn a new point
+ else if (Input.GetKey(KeyCode.LeftShift))
{
if (this.lineModeIsFirstPointSelected)
{
-
+
CommunicationEvents.StopLineDrawingEvent.Invoke(null);
- SmallRocket(hit,this.lineModeFirstPointSelected.Id);
+ SmallRocket(hit, this.lineModeFirstPointSelected.Id);
this.lineModeIsFirstPointSelected = false;
@@ -288,6 +292,32 @@ public void OnHit(RaycastHit hit)
}
}
+ //if we hit the top snap zone
+ else if (hit.transform.gameObject.tag=="SnapZone")
+ {
+ if (this.lineModeIsFirstPointSelected)
+ {
+
+ RaycastHit downHit;
+
+ if (Physics.Raycast(hit.transform.gameObject.transform.position-Vector3.down*2,Vector3.down, out downHit))
+ {
+ int idA = downHit.transform.gameObject.GetComponent<FactObject>().Id;
+ int idB = this.lineModeFirstPointSelected.Id;
+ int idC = GetFirstEmptyID();
+ CommunicationEvents.AddFactEvent.Invoke(this.AddPointFact(hit, idC));
+ //Event for end of line-drawing in "ShinyThings"
+ CommunicationEvents.StopLineDrawingEvent.Invoke(null);
+ //Create LineFact
+ CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact(idA, idB, idC, GetFirstEmptyID()));
+ this.lineModeIsFirstPointSelected = false;
+ this.lineModeFirstPointSelected = null;
+ }
+ }
+ }
+
+
+ //If no Point was hit
else
{
if (this.lineModeIsFirstPointSelected)
diff --git a/Assets/Materials/AngleMaterial.mat b/Assets/Materials/AngleMaterial.mat
index 0b49b774250708ca8aa9dc8900536cde1305241b..08916143740fc60c108df8f6ac1b4ef2c681d6d1 100644
--- a/Assets/Materials/AngleMaterial.mat
+++ b/Assets/Materials/AngleMaterial.mat
@@ -8,12 +8,12 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AngleMaterial
- m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 4000
+ m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
@@ -57,6 +57,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
+ - _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
@@ -70,8 +71,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 1}
+ - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/LineMaterial.mat b/Assets/Materials/LineMaterial.mat
index e088dcea7a4b45dd93aadb423d24c0bd201a03cc..d70bd5813387c53ccbbf13e939ed6779a3d2b2c9 100644
--- a/Assets/Materials/LineMaterial.mat
+++ b/Assets/Materials/LineMaterial.mat
@@ -8,12 +8,12 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LineMaterial
- m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 4000
+ m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
@@ -57,6 +57,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
+ - _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
@@ -70,8 +71,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 1}
+ - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/PointMaterial.mat b/Assets/Materials/PointMaterial.mat
index 151626fc8136316ff05d6c787835b6eb5c121799..556feb8db1d9a66b2cfc0f1a7cac296b89ef4180 100644
--- a/Assets/Materials/PointMaterial.mat
+++ b/Assets/Materials/PointMaterial.mat
@@ -79,5 +79,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 1}
+ - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/SeeThrough 1.mat b/Assets/Materials/SeeThrough 1.mat
new file mode 100644
index 0000000000000000000000000000000000000000..012caa9b44566e416d043c154506a93462b66801
--- /dev/null
+++ b/Assets/Materials/SeeThrough 1.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SeeThrough 1
+ m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, type: 3}
+ m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 10
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 3
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 0
+ m_Colors:
+ - _Color: {r: 0.972549, g: 0.30369413, b: 0, a: 0.11372549}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/SeeThrough 1.mat.meta b/Assets/Materials/SeeThrough 1.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..31548f1e285f0bd79d8f4a07f7ff255ea8868e7b
--- /dev/null
+++ b/Assets/Materials/SeeThrough 1.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3750cc498409144f8fd06ac559355b8
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Line.prefab b/Assets/Resources/Prefabs/Line.prefab
index d36691901aa64f3cbe04fb879c84ccbee8ccefb9..ac7c2bca63435944471b43c1d35fbafe1eb6b516 100644
--- a/Assets/Resources/Prefabs/Line.prefab
+++ b/Assets/Resources/Prefabs/Line.prefab
@@ -108,7 +108,7 @@ MeshRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
--- !u!33 &6001947194413960154
MeshFilter:
m_ObjectHideFlags: 0
diff --git a/Assets/TreeWorld.unity b/Assets/TreeWorld.unity
index d7f202bf87d60db14917a64e3f6215a149dae34b..dfa2b0c633055c12a40aa63824abcd618c5e461f 100644
--- a/Assets/TreeWorld.unity
+++ b/Assets/TreeWorld.unity
@@ -338,6 +338,58 @@ PrefabInstance:
propertyPath: m_Name
value: Broadleaf_Desktop
objectReference: {fileID: 0}
+ - target: {fileID: 100010, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100012, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100020, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100022, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100024, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100026, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100028, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100030, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100032, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100034, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100014, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100016, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 100018, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 400000, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_LocalPosition.x
value: 2.6310663
@@ -1420,6 +1472,8 @@ GameObject:
m_Component:
- component: {fileID: 1009368149}
- component: {fileID: 1009368150}
+ - component: {fileID: 1009368152}
+ - component: {fileID: 1009368151}
m_Layer: 0
m_Name: RootSnapZone
m_TagString: SnapZone
@@ -1434,9 +1488,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1009368148}
- m_LocalRotation: {x: -0, y: -0.030180298, z: 0.7032498, w: 0.710302}
- m_LocalPosition: {x: -0.12, y: 0.48, z: 0.09}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.48, z: 0}
+ m_LocalScale: {x: 3, y: 3, z: 3}
m_Children: []
m_Father: {fileID: 1347135377}
m_RootOrder: 17
@@ -1452,8 +1506,53 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Radius: 2
+ m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1009368151
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1009368148}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e3750cc498409144f8fd06ac559355b8, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ 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
+--- !u!33 &1009368152
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1009368148}
+ m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1017737548
GameObject:
m_ObjectHideFlags: 0
@@ -1969,6 +2068,97 @@ Transform:
m_Father: {fileID: 684756692}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1563243733
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1563243734}
+ - component: {fileID: 1563243737}
+ - component: {fileID: 1563243736}
+ - component: {fileID: 1563243735}
+ m_Layer: 0
+ m_Name: TopSnapZone
+ m_TagString: SnapZone
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1563243734
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1563243733}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 16.97, z: 0}
+ m_LocalScale: {x: 3, y: 3, z: 3}
+ m_Children: []
+ m_Father: {fileID: 1347135377}
+ m_RootOrder: 18
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1563243735
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1563243733}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e3750cc498409144f8fd06ac559355b8, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ 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
+--- !u!33 &1563243736
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1563243733}
+ m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!135 &1563243737
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1563243733}
+ 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!1 &1661088665 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4170768672499845195, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
@@ -2038,7 +2228,7 @@ LineRenderer:
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- - {x: 0, y: 0, z: 1}
+ - {x: 0, y: 0, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1