Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Kopernicus/ic-viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
StollD committed Aug 12, 2018
2 parents 02942c2 + 9b85d04 commit 423aff4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 1 addition & 5 deletions Unity Project/IC Viewer/Assets/Scripts/Body.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
using UnityEngine;
using UnityEngine.UI;

/// <summary>
/// TO DO: TOTALLY DELETE GAMEBODY
/// </summary>
public class Body : MonoBehaviour
{
public static Sprite starSprite, blackHoleSprite, pixelSprite;
Expand Down Expand Up @@ -185,8 +182,7 @@ public static void ParseSpectralClass(Body b, out Sprite sprite, out Color color
{
sprite = blackHoleSprite;
color = new Color(1, 0, 1, 1);

Debug.LogWarning(b.bodyName + "'s spectral class [" + b.bodyClass + "]" +
Logger.Warning(b.bodyName + "'s spectral class [" + b.bodyClass + "]" +
" is not supported by the spectral parser !");
}
}
Expand Down
6 changes: 3 additions & 3 deletions Unity Project/IC Viewer/Assets/Standard Scene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.0000132159485, g: 0.0028079145, b: 0.005231972, a: 1}
m_IndirectSpecularColor: {r: 0.000015701526, g: 0.0028079145, b: 0.006480797, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1998,8 +1998,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c9d68cb6ebc06ec4c87a2bd1b6b6507c, type: 3}
m_Name:
m_EditorClassIdentifier:
forward: 122
left: 113
forward: 119
left: 97
backward: 115
right: 100
scrollSensivity: 100
Expand Down

0 comments on commit 423aff4

Please sign in to comment.