Skip to content

Commit

Permalink
Fix ring shader loading
Browse files Browse the repository at this point in the history
Dorian Stoll committed Jun 15, 2017
1 parent e16275e commit c25f671
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 0 additions & 5 deletions Kopernicus/Kopernicus.Components/ShaderLoader.cs
Original file line number Diff line number Diff line change
@@ -53,11 +53,6 @@ public static Shader GetShader(String shaderName)
{
Debug.Log("[Kopernicus] ShaderLoader: GetShader " + shaderName);

if (shaderDictionary.Count == 0)
{
LoadAssetBundle("Kopernicus/Shaders", "kopernicusshaders");
}

if (shaderDictionary.ContainsKey(shaderName))
{
return shaderDictionary[shaderName];
6 changes: 5 additions & 1 deletion Kopernicus/Kopernicus/Configuration/Loader.cs
Original file line number Diff line number Diff line change
@@ -32,7 +32,8 @@
using System.Collections.Generic;
using UnityEngine;
using Kopernicus.Configuration.Asteroids;

using Kopernicus.Components;

namespace Kopernicus
{
namespace Configuration
@@ -169,6 +170,9 @@ void IParserEventSubscriber.Apply(ConfigNode node)
systemPrefab.systemTimeScale = 1.0;
systemPrefab.systemScale = 1.0;
systemPrefab.mainToolbarSelected = 2; // initial value in stock systemPrefab. Unknown significance.

// Load the ring shader
ShaderLoader.LoadAssetBundle("Kopernicus/Shaders", "kopernicusshaders");
}

// Generates the system prefab from the configuration

0 comments on commit c25f671

Please sign in to comment.