diff --git a/FricaDeGaze/Assembly-CSharp-vs.csproj b/FricaDeGaze/Assembly-CSharp-vs.csproj index e88e987..d88c5c3 100644 --- a/FricaDeGaze/Assembly-CSharp-vs.csproj +++ b/FricaDeGaze/Assembly-CSharp-vs.csproj @@ -46,6 +46,7 @@ + diff --git a/FricaDeGaze/Assembly-CSharp.csproj b/FricaDeGaze/Assembly-CSharp.csproj index c0b9c07..c073f9d 100644 --- a/FricaDeGaze/Assembly-CSharp.csproj +++ b/FricaDeGaze/Assembly-CSharp.csproj @@ -46,6 +46,7 @@ + diff --git a/FricaDeGaze/Assets/FricaDeGazeScene.unity b/FricaDeGaze/Assets/FricaDeGazeScene.unity index be432ba..fe2ff1a 100644 Binary files a/FricaDeGaze/Assets/FricaDeGazeScene.unity and b/FricaDeGaze/Assets/FricaDeGazeScene.unity differ diff --git a/FricaDeGaze/Assets/misca2.cs b/FricaDeGaze/Assets/misca2.cs index 0477771..80ab1a6 100644 --- a/FricaDeGaze/Assets/misca2.cs +++ b/FricaDeGaze/Assets/misca2.cs @@ -4,15 +4,38 @@ using System.Collections; public class misca2 : MonoBehaviour { public Transform target; + public float RotationSpeed; + IEnumerator Start () { + //yield return new WaitForSeconds (0.2f); //float width = camera.pixelWidth; - Vector3 dis = transform.position - target.position; - float xpos = Random.Range (-dis.x, dis.x); - while (xpos+dis.x > target.position.x || xpos+dis.x < -target.position.x ) + /*float speed = 1; + //move towards the center of the world (or where ever you like) + Vector3 targetPosition = target.position; + + Vector3 currentPosition = this.transform.position; + //first, check to see if we're close enough to the target + if(Vector3.Distance(currentPosition, targetPosition) > .1f) { + Vector3 directionOfTravel = targetPosition - currentPosition; + //now normalize the direction, since we only want the direction information + directionOfTravel.Normalize(); + //scale the movement on each axis by the directionOfTravel vector components + + this.transform.Translate( + 0, + (directionOfTravel.y * speed * Time.deltaTime), + 0, + Space.World); + }*/ + //transform.RotateAround (target.position, new Vector3 (0, target.position.y, 0), 0); + //transform.position = new Vector3(target.position.x,0.1f+target.position.y,target.position.z); + float dis = Vector3.Distance (transform.position, target.position); + float xpos = Random.Range (-target.position.x, target.position.x); + //while (xpos > target.position.x) xpos = Random.Range (-target.position.x, target.position.x); float zpos = Random.Range (-target.position.z, target.position.z); - while (zpos+dis.z > target.position.z) + //while (zpos > target.position.z) zpos = Random.Range (-target.position.z, target.position.z); Vector3 position = new Vector3(xpos, 0, zpos); @@ -21,30 +44,34 @@ public class misca2 : MonoBehaviour { Vector3 pointA = transform.position; //Vector3 pointB = pointA + new Vector3 (0.5f,0,0.5f); while (true) { - yield return StartCoroutine(MoveObject(transform, pointA, position, 1.5f)); - yield return StartCoroutine(MoveObject(transform, position, pointA, 1.5f)); - while (xpos > target.position.x) + yield return StartCoroutine(MoveObject(transform, pointA, position, 0.1f)); + yield return StartCoroutine(MoveObject(transform, position, pointA, 0.1f)); + //while (xpos > target.position.x) xpos = Random.Range (-target.position.x, target.position.x); - while (zpos > target.position.z || zpos< -target.position.z) - zpos = Random.Range (-target.position.z, target.position.z); + //while (zpos > target.position.z) + zpos = Random.Range (-target.position.z, target.position.z); position.x = xpos; - position.y = zpos; + position.z = zpos; } } IEnumerator MoveObject (Transform thisTransform, Vector3 startPos, Vector3 endPos, float time) { + + float i = 0.0f; - float rate = 1.0f / time; + float rate = 0.1f / time; while (i < 1.0f) { i += Time.deltaTime * rate; thisTransform.position = Vector3.Lerp(startPos, endPos, i); + yield return null; } } - + + // Update is called once per frame void Update () { + } - } } diff --git a/FricaDeGaze/Assets/spider.blend.meta b/FricaDeGaze/Assets/spider.blend.meta index f828c2d..d262993 100644 --- a/FricaDeGaze/Assets/spider.blend.meta +++ b/FricaDeGaze/Assets/spider.blend.meta @@ -374,7 +374,7 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: .200000003 meshCompression: 0 addColliders: 0 importBlendShapes: 1 diff --git a/FricaDeGaze/FricaDeGaze-csharp.sln b/FricaDeGaze/FricaDeGaze-csharp.sln index 76adec4..9e7506f 100644 --- a/FricaDeGaze/FricaDeGaze-csharp.sln +++ b/FricaDeGaze/FricaDeGaze-csharp.sln @@ -23,7 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/FricaDeGaze/FricaDeGaze.sln b/FricaDeGaze/FricaDeGaze.sln index 717fb4e..3f1e7b7 100644 --- a/FricaDeGaze/FricaDeGaze.sln +++ b/FricaDeGaze/FricaDeGaze.sln @@ -29,7 +29,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/FricaDeGaze/FricaDeGaze.userprefs b/FricaDeGaze/FricaDeGaze.userprefs index 952a707..e3d4a44 100644 --- a/FricaDeGaze/FricaDeGaze.userprefs +++ b/FricaDeGaze/FricaDeGaze.userprefs @@ -1,11 +1,11 @@  - + - + + - diff --git a/FricaDeGaze/Library/CurrentLayout.dwlt b/FricaDeGaze/Library/CurrentLayout.dwlt index 4282dac..19a0df1 100644 Binary files a/FricaDeGaze/Library/CurrentLayout.dwlt and b/FricaDeGaze/Library/CurrentLayout.dwlt differ diff --git a/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt b/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt index bad4e88..8f5795d 100644 Binary files a/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt and b/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt differ diff --git a/FricaDeGaze/Library/InspectorExpandedItems.asset b/FricaDeGaze/Library/InspectorExpandedItems.asset index 0a0507f..252da8b 100644 Binary files a/FricaDeGaze/Library/InspectorExpandedItems.asset and b/FricaDeGaze/Library/InspectorExpandedItems.asset differ diff --git a/FricaDeGaze/Library/assetDatabase3 b/FricaDeGaze/Library/assetDatabase3 index 7c7a220..1f95667 100644 Binary files a/FricaDeGaze/Library/assetDatabase3 and b/FricaDeGaze/Library/assetDatabase3 differ diff --git a/FricaDeGaze/Library/expandedItems b/FricaDeGaze/Library/expandedItems index 0cc07ca..78d6c54 100644 Binary files a/FricaDeGaze/Library/expandedItems and b/FricaDeGaze/Library/expandedItems differ diff --git a/FricaDeGaze/Library/guidmapper b/FricaDeGaze/Library/guidmapper index 892cf01..aa337aa 100644 Binary files a/FricaDeGaze/Library/guidmapper and b/FricaDeGaze/Library/guidmapper differ diff --git a/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 b/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 index a5cee4c..26098a5 100644 Binary files a/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 and b/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 differ