Skip to content

Commit

Permalink
migrated to unity 5
Browse files Browse the repository at this point in the history
  • Loading branch information
seokhoon choi authored and seokhoon choi committed May 14, 2015
1 parent f076bbe commit 0ceaeff
Show file tree
Hide file tree
Showing 32 changed files with 40 additions and 189 deletions.
70 changes: 4 additions & 66 deletions StrangeRocks/Assembly-CSharp-vs.csproj
View file
Expand Up @@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_2;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -46,51 +46,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\UnityTestTools\Assertions\AssertionComponent.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\AssertionComponentExt.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\AssertionException.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Assertions.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ActionBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\BoolComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ColliderComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ComparerBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\FloatComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\GeneralComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\IntComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\IsRenderedByCamera.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\StringComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\TransformComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ValueDoesNotChange.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector2Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector3Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector4Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\VectorComparerBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\PropertyResolver.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\ScriptSelector.cs" />
<Compile Include="Assets\UnityTestTools\Common\ITestResult.cs" />
<Compile Include="Assets\UnityTestTools\Common\Icons.cs" />
<Compile Include="Assets\UnityTestTools\Common\TestResultState.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\DelayedDeactivation.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\Eject.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\TheGreatActivator.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Fx\GlowPlaneOrient.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Fx\ReflectionFx.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\GameScore.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\DemoControl.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\GameOverGUI.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\InitLevelManager.cs" />
<Compile Include="Assets\UnityTestTools\Examples\CustomComponent.cs" />
<Compile Include="Assets\UnityTestTools\Examples\ThrowCustomException.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ITestRunnerCallback.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\IntegrationTest.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\ResultSummarizer.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\StackTraceFilter.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\XmlResultWriter.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestComponent.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestResult.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestRunner.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestRunnerCallbackList.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestingAssets\CallTesting.cs" />
<Compile Include="Assets\scripts\strange\ReadMe.cs" />
<Compile Include="Assets\scripts\strange\extensions\command\api\CommandExceptionType.cs" />
<Compile Include="Assets\scripts\strange\extensions\command\api\CommandKeys.cs" />
Expand Down Expand Up @@ -280,27 +235,10 @@
<Compile Include="Assets\scripts\strangerocks\ui\view\StartLevelMediator.cs" />
<Compile Include="Assets\scripts\strangerocks\ui\view\StartLevelPanelView.cs" />
<Compile Include="Assets\scripts\thirdparty\SimpleJSON.cs" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Cursor.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleAdditiveBlend.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Additive.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\HeightDepthOfField.shader" />
<None Include="Assets\scripts\strange\extensions\ReadMe.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\BlurPassesForDof.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\Fallback.shader" />
<None Include="Assets\UnityTestTools\changelog.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Multiply.shader" />
<None Include="Assets\UnityTestTools\LICENSE.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\CharacterSelfIlluminationReflective.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\ColoredNoise.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\PlanarRealtimeReflection.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\ReflectiveBackgroundPlanar.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\EnemySelfIlluminationReflective.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\AngryInclude.cginc" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\MobileBloom.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleAdditive.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\LaserScope.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\SuperSimpleSelfIllumination.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleBlend.shader" />
<Reference Include="UnityEngine.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
70 changes: 4 additions & 66 deletions StrangeRocks/Assembly-CSharp.csproj
View file
Expand Up @@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_2;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -46,51 +46,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\UnityTestTools\Assertions\AssertionComponent.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\AssertionComponentExt.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\AssertionException.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Assertions.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ActionBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\BoolComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ColliderComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ComparerBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\FloatComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\GeneralComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\IntComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\IsRenderedByCamera.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\StringComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\TransformComparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\ValueDoesNotChange.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector2Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector3Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\Vector4Comparer.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\Comparers\VectorComparerBase.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\PropertyResolver.cs" />
<Compile Include="Assets\UnityTestTools\Assertions\ScriptSelector.cs" />
<Compile Include="Assets\UnityTestTools\Common\ITestResult.cs" />
<Compile Include="Assets\UnityTestTools\Common\Icons.cs" />
<Compile Include="Assets\UnityTestTools\Common\TestResultState.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\DelayedDeactivation.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\Eject.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Animation\Escape\TheGreatActivator.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Fx\GlowPlaneOrient.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Fx\ReflectionFx.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\GameScore.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\DemoControl.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\GameOverGUI.cs" />
<Compile Include="Assets\UnityTestTools\Examples\AngryBotsTests\Scripts\Misc\InitLevelManager.cs" />
<Compile Include="Assets\UnityTestTools\Examples\CustomComponent.cs" />
<Compile Include="Assets\UnityTestTools\Examples\ThrowCustomException.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ITestRunnerCallback.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\IntegrationTest.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\ResultSummarizer.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\StackTraceFilter.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\ResultWriter\XmlResultWriter.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestComponent.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestResult.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestRunner.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestRunner\TestRunnerCallbackList.cs" />
<Compile Include="Assets\UnityTestTools\IntegrationTestsFramework\TestingAssets\CallTesting.cs" />
<Compile Include="Assets\scripts\strange\ReadMe.cs" />
<Compile Include="Assets\scripts\strange\extensions\command\api\CommandExceptionType.cs" />
<Compile Include="Assets\scripts\strange\extensions\command\api\CommandKeys.cs" />
Expand Down Expand Up @@ -280,27 +235,10 @@
<Compile Include="Assets\scripts\strangerocks\ui\view\StartLevelMediator.cs" />
<Compile Include="Assets\scripts\strangerocks\ui\view\StartLevelPanelView.cs" />
<Compile Include="Assets\scripts\thirdparty\SimpleJSON.cs" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Cursor.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleAdditiveBlend.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Additive.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\HeightDepthOfField.shader" />
<None Include="Assets\scripts\strange\extensions\ReadMe.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\BlurPassesForDof.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\Fallback.shader" />
<None Include="Assets\UnityTestTools\changelog.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\Multiply.shader" />
<None Include="Assets\UnityTestTools\LICENSE.txt" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\CharacterSelfIlluminationReflective.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\ColoredNoise.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\PlanarRealtimeReflection.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\ReflectiveBackgroundPlanar.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\EnemySelfIlluminationReflective.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\AngryInclude.cginc" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Resources\MobileBloom.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleAdditive.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\LaserScope.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\BackgroundAndCharacters\SuperSimpleSelfIllumination.shader" />
<None Include="Assets\UnityTestTools\Examples\AngryBotsTests\Shaders\Fx\ParticleBlend.shader" />
<Reference Include="UnityEngine.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion StrangeRocks/Assets/scripts/strangerocks/common/util/ScreenUtil.cs
View file
Expand Up @@ -45,7 +45,7 @@ public Rect GetScreenRect (float x, float y, float width, float height)
public bool IsInCamera(GameObject go)
{
Plane[] planes = GeometryUtility.CalculateFrustumPlanes (gameCamera);
return GeometryUtility.TestPlanesAABB (planes, go.renderer.bounds);
return GeometryUtility.TestPlanesAABB (planes, go.GetComponent<Renderer>().bounds);
}

//When a rock or the player exists the screen,
Expand Down
4 changes: 2 additions & 2 deletions StrangeRocks/Assets/scripts/strangerocks/common/view/ButtonMouseMediator.cs
View file
Expand Up @@ -24,12 +24,12 @@ protected void OnMouseUp()

protected void OnMouseEnter()
{
view.background.renderer.material.color = view.overColor;
view.background.GetComponent<UnityEngine.Renderer>().material.color = view.overColor;
}

protected void OnMouseExit()
{
view.background.renderer.material.color = view.normalColor;
view.background.GetComponent<UnityEngine.Renderer>().material.color = view.normalColor;
}

#endif
Expand Down
2 changes: 1 addition & 1 deletion StrangeRocks/Assets/scripts/strangerocks/common/view/ButtonTouchMediator.cs
View file
Expand Up @@ -26,7 +26,7 @@ void Update()
RaycastHit hit;
if (Physics.Raycast (ray, out hit))
{
if (hit.collider == collider)
if (hit.collider == GetComponent<Collider>())
{
if (touch.phase == TouchPhase.Began)
{
Expand Down
4 changes: 2 additions & 2 deletions StrangeRocks/Assets/scripts/strangerocks/common/view/ButtonView.cs
View file
Expand Up @@ -48,13 +48,13 @@ protected override void Start ()
internal void pressBegan()
{
pressSignal.Dispatch ();
background.renderer.material.color = pressColor;
background.GetComponent<Renderer>().material.color = pressColor;
}

internal void pressEnded()
{
releaseSignal.Dispatch ();
background.renderer.material.color = normalColor;
background.GetComponent<Renderer>().material.color = normalColor;
}
}
}
2 changes: 1 addition & 1 deletion StrangeRocks/Assets/scripts/strangerocks/game/controller/enemy/DestroyEnemyCommand.cs
View file
Expand Up @@ -59,7 +59,7 @@ public override void Execute ()

//We're pooling instances, not actually destroying them,
//So reset the instances to an appropriate state for reuse...
enemyView.rigidbody.velocity = Vector3.zero;
enemyView.GetComponent<Rigidbody>().velocity = Vector3.zero;
enemyView.gameObject.SetActive (false);

//...store them offscreen...
Expand Down

0 comments on commit 0ceaeff

Please sign in to comment.