Merge commit '6bd8afd3e7588e6c4e249821acea0fcf97f7d46d'

# Conflicts: # Assets/Door.FBX.meta # Assets/DoorFrame.FBX.meta # Assets/Materials/M_Door.mat # Assets/Materials/M_Door.mat.meta # Assets/Materials/M_Frame.mat # Assets/Materials/M_Frame.mat.meta # Assets/Materials/M_Glass.mat # Assets/Materials/M_Glass.mat.meta # Assets/WindowFrame.FBX.meta
2016-05-26 23:54:07 +02:00
parent 17576b4713 6bd8afd3e7
commit e1e408580a
36 changed files with 219 additions and 1 deletions
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59333be441c0e8042b8c2e75ae9d5f29
+timeCreated: 1464201019
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae7fe334022b0574cb52f4e90e3fa2b5
+timeCreated: 1464200340
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a6a6c2e668ad79449b48ee55868b4e2d
+timeCreated: 1464201025
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90a52fc266c12ff41ab5b486a49bcb9c
+timeCreated: 1464211843
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,81 @@
+Shader "Outlined/Silhouette Only" {
+	Properties {
+		_OutlineColor ("Outline Color", Color) = (0,0,0,1)
+		_Outline ("Outline width", Range (0.0, 0.03)) = .005
+	}
+ 
+CGINCLUDE
+#include "UnityCG.cginc"
+ 
+struct appdata {
+	float4 vertex : POSITION;
+	float3 normal : NORMAL;
+};
+ 
+struct v2f {
+	float4 pos : POSITION;
+	float4 color : COLOR;
+};
+ 
+uniform float _Outline;
+uniform float4 _OutlineColor;
+ 
+v2f vert(appdata v) {
+	// just make a copy of incoming vertex data but scaled according to normal direction
+	v2f o;
+	o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+ 
+	float3 norm   = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal);
+	float2 offset = TransformViewToProjection(norm.xy);
+ 
+	o.pos.xy += offset * o.pos.z * _Outline;
+	o.color = _OutlineColor;
+	return o;
+}
+ENDCG
+ 
+	SubShader {
+		Tags { "Queue" = "Transparent" }
+ 
+		Pass {
+			Name "BASE"
+			Cull Back
+			Blend Zero One
+ 
+			// uncomment this to hide inner details:
+			//Offset -8, -8
+ 
+			SetTexture [_OutlineColor] {
+				ConstantColor (0,0,0,0)
+				Combine constant
+			}
+		}
+ 
+		// note that a vertex shader is specified here but its using the one above
+		Pass {
+			Name "OUTLINE"
+			Tags { "LightMode" = "Always" }
+			Cull Front
+ 
+			// you can choose what kind of blending mode you want for the outline
+			//Blend SrcAlpha OneMinusSrcAlpha // Normal
+			//Blend One One // Additive
+			Blend One OneMinusDstColor // Soft Additive
+			//Blend DstColor Zero // Multiplicative
+			//Blend DstColor SrcColor // 2x Multiplicative
+ 
+CGPROGRAM
+#pragma vertex vert
+#pragma fragment frag
+ 
+half4 frag(v2f i) :COLOR {
+	return i.color;
+}
+ENDCG
+		}
+ 
+ 
+	}
+ 
+	Fallback "Diffuse"
+}
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ae08e8618ad9dff4fa23d8d6b596537a
+timeCreated: 1464211614
+licenseType: Free
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c69b52b8e87ea754994ac00acdfabfb8
+timeCreated: 1464200377
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51041ad68e4c65d41a1a15d7590c2ff7
+timeCreated: 1464200341
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e50a603b536606945b36631fc79b5aec
+timeCreated: 1464200340
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a916136b6f3b5504c9963795f4d7305d
+timeCreated: 1464200338
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1373b723e1243a243a66983d6dd78151
+timeCreated: 1464200377
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c3f871ccb3da7a41826bb8fc6932aba
+timeCreated: 1464200339
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 63630b5bb747d994c945f8b08587ad88
+timeCreated: 1464200375
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e30caeb0f90385540a1cf220e1fd5411
+timeCreated: 1464200340
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d0116a5581ef3a045a12d30788f2e607
+timeCreated: 1464200344
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4a778ba9498cca45bf17a04e46a6d19
+timeCreated: 1464200339
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2934a9d54fa49394b886e4d68568cc03
+timeCreated: 1464200377
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d12d8e82a709c124e9dbbf0fa2104a3c
+timeCreated: 1464200340
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: