Skip to content
This repository has been archived by the owner on Feb 13, 2018. It is now read-only.

Commit

Permalink
Merge pull request #34 from rubengc/master
Browse files Browse the repository at this point in the history
Project as library
  • Loading branch information
IronWarrior committed Dec 12, 2016
2 parents d59764e + 7f04bba commit 2871d9a
Show file tree
Hide file tree
Showing 126 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Assets/SuperCharacterController.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -218,7 +218,10 @@ bool PushBack()
{
isPushedBack = true;
Vector3 position = SpherePosition(collisionSpheres[i]); // The position of the sphere in world coordinates
Vector3 contactPoint = SuperCollider.ClosestPointOnSurface(overlappingColliders[j], position, radius); // The closest point on the collider, named contact point
Vector3 contactPoint;

SuperCollider.ClosestPointOnSurface(overlappingColliders[j], position, radius, out contactPoint); // The closest point on the collider, named contact point

if (contactPoint != Vector3.zero) // Contact point was found
{
Vector3 v = contactPoint - position; //The direction from the position of the sphere to the contact point
Expand Down
9 changes: 9 additions & 0 deletions Assets/SuperCharacterController/SuperCharacterController.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes
Binary file added ProjectSettings/ClusterInputManager.asset
Binary file not shown.
Binary file modified ProjectSettings/GraphicsSettings.asset
Binary file not shown.
3 changes: 1 addition & 2 deletions ProjectSettings/ProjectVersion.txt
@@ -1,2 +1 @@
m_EditorVersion: 5.1.1f1
m_StandardAssetsVersion: 0
m_EditorVersion: 5.5.0f3
Binary file added ProjectSettings/UnityConnectSettings.asset
Binary file not shown.
Binary file added SuperCharacterController.unitypackage
Binary file not shown.

0 comments on commit 2871d9a

Please sign in to comment.