Merge branch 'master' of github.com:teamfisk/VstyleR

2016-05-23 22:49:51 +02:00
parent 96acdc206b 377ecb491f
commit 81dd43a4ce
45 changed files with 586 additions and 65 deletions
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c9a1b6ec5a2e0d6429b2577039884509
+folderAsset: yes
+timeCreated: 1464026083
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 20f750e5957fb9f439c9216bbf14c569
-timeCreated: 1463689741
+guid: 4330f0e761e0d1345a8d7590f8d7954f
+timeCreated: 1464025991
 licenseType: Free
 NativeFormatImporter:
  userData: 
@@ -0,0 +1,20 @@
+fileFormatVersion: 2
+guid: a8b81d3342751554b9217e5f07c6e86b
+timeCreated: 1464027391
+licenseType: Free
+TrueTypeFontImporter:
+  serializedVersion: 3
+  fontSize: 256
+  forceTextureCase: 0
+  characterSpacing: 1
+  characterPadding: 0
+  includeFontData: 1
+  fontNames: []
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: e201ce4f474f0c14981abdac6bf8860c, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: e201ce4f474f0c14981abdac6bf8860c
+timeCreated: 1464027392
+licenseType: Free
+TrueTypeFontImporter:
+  serializedVersion: 3
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 1
+  characterPadding: 0
+  includeFontData: 1
+  fontNames: []
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d050741419ef7064cbbf53934a7f7353
-timeCreated: 1463689745
+guid: f28664ecb5ca3d64b909e516ad1cdd71
+timeCreated: 1464027449
 licenseType: Free
 NativeFormatImporter:
  userData: 
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 4ab566410b504b4438b6382339277631
+timeCreated: 1464026598
+licenseType: Free
+TrueTypeFontImporter:
+  serializedVersion: 3
+  fontSize: 256
+  forceTextureCase: 0
+  characterSpacing: 1
+  characterPadding: 0
+  includeFontData: 1
+  fontNames: []
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b169001aae2ade4ab847648fa6f3161
+timeCreated: 1464027130
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 82d579c5a2c97954d8f0f0b3f7d2d7b8
+timeCreated: 1464026599
+licenseType: Free
+TrueTypeFontImporter:
+  serializedVersion: 3
+  fontSize: 256
+  forceTextureCase: 0
+  characterSpacing: 1
+  characterPadding: 0
+  includeFontData: 1
+  fontNames: []
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,18 @@
+Shader "GUI/TextWithDepth" {
+    Properties{
+        _MainTex("Font Texture", 2D) = "white" {}
+    _Color("Text Color", Color) = (1, 1, 1, 1)
+    }
+
+        SubShader{
+        Tags{ "Queue" = "Transparent" "IgnoreProjector" = "True" "RenderType" = "Transparent" }
+        Lighting Off Cull Off ZWrite Off Fog{ Mode Off }
+        Blend SrcAlpha OneMinusSrcAlpha
+        Pass{
+        Color[_Color]
+        SetTexture[_MainTex]{
+        combine primary, texture * primary
+    }
+    }
+    }
+}
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 51af322cb585ad744afc1c60957cb4c8
+timeCreated: 1464025853
+licenseType: Free
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2b181a21ef1fe9d4db8730525cf41b67
+folderAsset: yes
+timeCreated: 1464030294
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: fa548e7cac28abf4495e909965a7fb52
+folderAsset: yes
+timeCreated: 1450547173
+licenseType: Store
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4468cf691a0d9e74183ca9beb3c7c990
+timeCreated: 1450547251
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 09485c71d5564f24f92d4244bc27b5fc
+timeCreated: 1450547176
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 1b733cade4c3ad644b02226637e1cd09
+timeCreated: 1450547176
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: e816a17296a9d184ebfff0f3b41205ef
+timeCreated: 1450547183
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: f6f3a44b2b12e9a45bc02ff2350c2873
+timeCreated: 1450547185
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 76cfeb5d9a2650144902a599ec509800
+timeCreated: 1450547179
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: a6202455a7a564340b2dd1deb92aaa75
+timeCreated: 1450547180
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 833f94a1676337c44bab918d55c563e3
+timeCreated: 1464029441
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dbe36515364eb1147877c8671b6f5128
+timeCreated: 1464029183
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd4d9c447da788945a48d29d63db76b2
+timeCreated: 1464029568
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1e48cc47058f70a40832134fa11986fd
+timeCreated: 1464030617
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,35 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+
+[ExecuteInEditMode]
+public class WarehouseColumn : MonoBehaviour {
+
+    private BezierCurve curve;
+    private Transform rows;
+
+    private float offset = 0.0f;
+
+    void Awake() {
+        curve = transform.Find("Curve").GetComponent<BezierCurve>();
+        rows = transform.Find("Rows");
+    }
+
+	void Start () {
+	
+	}
+	
+    void Update() {
+        if (Application.isPlaying) {
+            offset += Time.deltaTime;
+        }
+
+        foreach (Transform row in rows) {
+            var i = row.GetSiblingIndex();
+            var distance = (float)i / (rows.childCount) * curve.length + offset;
+            distance = Mathf.Repeat(distance, curve.length);
+            var pos = curve.GetPointAtDistance(distance);
+            row.position = pos;
+        }
+    }
+}
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c88cdd3c5a01be746a69b3b3cc95d136
+timeCreated: 1464021754
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -5,83 +5,48 @@ using UnityEditor;

 [ExecuteInEditMode]
 public class WarehouseRow : MonoBehaviour {
-    public GameObject[] Prefabs;
-    public bool ShowInEditor = false;
+    public string Category;

    BezierCurve curve;
-
-    List<GameObject> furnitures;
+    Transform furniture;

    float offset = 0;

-    // Use this for initialization
+    void Awake() {
+        curve = transform.Find("Curve").GetComponent<BezierCurve>();
+        furniture = transform.Find("Furniture");
+    }
+
    void Start() {
-        curve = GetComponent<BezierCurve>();
-        furnitures = new List<GameObject>();
-
-#if UNITY_EDITOR
-        EditorApplication.playmodeStateChanged += StateChange;
-#endif
-        spawnPrefabs();
+        // Set up text
+        transform.Find("Text/Number").GetComponent<TextMesh>().text = (transform.GetSiblingIndex() + 1).ToString();
+        transform.Find("Text/Category").GetComponent<TextMesh>().text = Category;
    }

-    public void OnEnable() {
-        spawnPrefabs();
-    }
+    //void spawnPrefabs() {
+    //    if (furnitures.Count == 0) {
+    //        for (int i = 0; i < Prefabs.Length; i++) {
+    //            var prefab = Prefabs[i];

-    void OnDisable() {
-        foreach (var item in furnitures) {
-            GameObject.DestroyImmediate(item);
-        }
-        furnitures.Clear();
-    }
+    //            GameObject furniture = Instantiate(prefab);
+    //            furniture.transform.SetParent(transform);
+    //            furniture.layer = 8;
+    //            furnitures.Add(furniture);
+    //        }
+    //    }
+    //}

-    void OnDestroy() {
-        foreach (var item in furnitures) {
-            GameObject.DestroyImmediate(item);
-        }
-        furnitures.Clear();
-    }
-
-    void StateChange() {
-        if (EditorApplication.isPlayingOrWillChangePlaymode && !EditorApplication.isPlaying) {
-            OnDisable();
-        }
-    }
-
-    void OnValidate() {
-        foreach (var item in furnitures) {
-            GameObject.DestroyImmediate(item);
-        }
-        furnitures.Clear();
-        spawnPrefabs();
-    }
-
-    void spawnPrefabs() {
-        if (furnitures.Count == 0) {
-            for (int i = 0; i < Prefabs.Length; i++) {
-                var prefab = Prefabs[i];
-
-                GameObject furniture = Instantiate(prefab);
-                furniture.transform.SetParent(transform);
-                furnitures.Add(furniture);
-            }
-        }
-    }
-
-    // Update is called once per frame
    void Update() {
        if (Application.isPlaying) {
-            offset += Time.deltaTime;
+            //offset += Time.deltaTime;
        }

-        for (int i = 0; i < furnitures.Count; i++) {
-            var furniture = furnitures[i];
-
-            var distance = (float)i / (furnitures.Count - 1) * curve.length + offset;
+        foreach (Transform t in furniture) {
+            var i = t.GetSiblingIndex();
+            var distance = (float)i / (furniture.childCount) * curve.length + offset;
            distance = Mathf.Repeat(distance, curve.length);
            var pos = curve.GetPointAtDistance(distance);
-            furniture.transform.position = pos;
+            t.position = pos;
        }
    }
 }