Merge remote-tracking branch 'origin/master' into Templates

Assets/BezierCurves/Scripts/BezierCurve.cs

@@ -553,12 +553,16 @@ public class BezierCurve : MonoBehaviour {
 		return GetPoint(firstPoint, secondPoint, distance / curveLength);
 	}
     
-    public Vector3 GetUniformPointAtDistance(float distance) {
+    private Vector3 GetAtPolylineDistance(float distance, bool returnDirection = false) {
-
+        Vector3 defaultDir = new Vector3(1, 0, 0);
-        if (distance <= 0) {
+        if (distance <= 0 || distance >= length) {
-            return points[0].position;
+            if (returnDirection) {
-        } else if (distance >= length) {
+                return defaultDir;
-            return points[points.Length - 1].position;
+            } else if (distance <= 0) {
+                return points[0].position;
+            } else {
+                return points[points.Length - 1].position;
+            }
         }
 
         float totalLength = 0;
@@ -581,22 +585,41 @@ public class BezierCurve : MonoBehaviour {
                 //Calculate the very first line segment
                 Vector3 s1 = p1.position;
                 Vector3 s2 = GetPoint(p1, p2, 1.0f / resolution);
-                float mag = (s2 - s1).magnitude;
+                Vector3 diff = s2 - s1;
+                Vector3 prevDiff = diff;
+                float mag = diff.magnitude;
                 float polylineLength = mag;
 
                 //Keep calculating line segments until we have traveled more than curveDistance.
                 for (int segmentIndex = 2; polylineLength < curveDistance; segmentIndex++) {
+                    prevDiff = diff;
                     s1 = s2;
                     s2 = GetPoint(p1, p2, (float)segmentIndex / resolution);
-                    mag = (s2 - s1).magnitude;
+                    diff = s2 - s1;
+                    mag = diff.magnitude;
                     polylineLength += mag;
                 }
-                //The desired position should be between s1 and s2.
+                if (returnDirection) {
-                //polylineLength should be slightly greater than curveDistance, the difference gives the 't' value.
+                    //return diff;  //This is the actual direction on the polyline, but it looks very jittery without interpolation.
-                return GetLinearPoint(s1, s2, 1 - (polylineLength - curveDistance) / mag);
+                    return Vector3.Slerp(prevDiff.normalized, diff.normalized, 1 - (polylineLength - curveDistance) / mag);
+                } else {
+                    //The desired position should be between s1 and s2.
+                    //polylineLength should be slightly greater than curveDistance, the difference gives the 't' value.
+                    return GetLinearPoint(s1, s2, 1 - (polylineLength - curveDistance) / mag);
+                }
             }
         }
 
-        return Vector3.zero;
+        return returnDirection ? defaultDir : Vector3.zero;
+    }
+
+    public Vector3 GetDirectionAtDistance(float distance)
+    {
+        return GetAtPolylineDistance(distance, true);
+    }
+
+    public Vector3 GetUniformPointAtDistance(float distance)
+    {
+        return GetAtPolylineDistance(distance, false);
     }
 }

Assets/Decoration.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 912995729338dbb4aae9d6aa943b25bf
+folderAsset: yes
+timeCreated: 1464292483
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Body_Diffuse_Blue.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 711b25ce3d0a68a4688b7a057fe2a426
+timeCreated: 1464292695
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/DefenderArmour.obj.meta

@@ -0,0 +1,78 @@
+fileFormatVersion: 2
+guid: ca652f1ffa90ce34b8b6c212b692ce91
+timeCreated: 1464293075
+licenseType: Free
+ModelImporter:
+  serializedVersion: 19
+  fileIDToRecycleName:
+    100000: default
+    100002: //RootNode
+    400000: default
+    400002: //RootNode
+    2300000: default
+    3300000: default
+    4300000: default
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleRotations: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/DefenderBody.obj.meta

@@ -0,0 +1,78 @@
+fileFormatVersion: 2
+guid: 7b2e0bc3715f9654fb69d111eccb2f3b
+timeCreated: 1464293075
+licenseType: Free
+ModelImporter:
+  serializedVersion: 19
+  fileIDToRecycleName:
+    100000: default
+    100002: //RootNode
+    400000: default
+    400002: //RootNode
+    2300000: default
+    3300000: default
+    4300000: default
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleRotations: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Defender_Armor_Diffuse_Blue.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 27772411eb8d7d343b91d8dd1b5f5d90
+timeCreated: 1464292695
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Materials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 31355a9d11b36fd48906d913586af625
+folderAsset: yes
+timeCreated: 1464293075
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Materials/Armour.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3bebb187e9fb69840b7836e439cfda04
+timeCreated: 1464293134
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Materials/Body.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 96327e05d43e0614db50f402dd5d3114
+timeCreated: 1464293172
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Materials/defaultMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28768ecadc1a13e4d93899964ef4f390
+timeCreated: 1464293075
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Decoration/Platform.obj.meta

@@ -0,0 +1,78 @@
+fileFormatVersion: 2
+guid: e2cee0ee452b7e446b9a299d41f22f0a
+timeCreated: 1464293268
+licenseType: Free
+ModelImporter:
+  serializedVersion: 19
+  fileIDToRecycleName:
+    100000: default
+    100002: //RootNode
+    400000: default
+    400002: //RootNode
+    2300000: default
+    3300000: default
+    4300000: default
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleRotations: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 1.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8b861d57adbe0c4abbdc5e33d07f9a7
+timeCreated: 1464273398
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 2.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d9743f42607f262488f7fcadef7ff58e
+timeCreated: 1464273668
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 3.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ea2aedfef7a357249b99040ce7a86d06
+timeCreated: 1464274411
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 4.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2bc9c4fcdb2121d4b8383da9562d3282
+timeCreated: 1464275163
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 5.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f45ba05bd621894c8e2061f8e8d8a51
+timeCreated: 1464281858
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Chair 6.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 30776503cefd5ce4fb7d019ff3b4d7fc
+timeCreated: 1464282388
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Decoration 1.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a25562228ee7b434bb78583f820c3009
+timeCreated: 1464275702
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Decoration 2.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5b8d0be60dae884d889481a7b7d561b
+timeCreated: 1464293513
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Lamp 1.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8382b3ab9ff439846b453005c3ab8513
+timeCreated: 1464280539
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Sofa 2.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 09a41dbb2d4c40d45851ce278fd59691
+timeCreated: 1464272886
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Sofa 3.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2781f3993f09a4843a05335c7a678d38
+timeCreated: 1464274038
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Furniture Prefabs/Table 1.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d2c993f5cd7f4094199c55e90ccf71ac
+timeCreated: 1464275426
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FurnitureTests.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ad6504734da8c44eb99f4241e6e367c
+timeCreated: 1464276022
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Measurement.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0d25bcec43b0e146a1079822593e248
+timeCreated: 1464295481
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Room.fbx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 60a5bfe5078684145bf4f52e7ecf47f5
+guid: a7d26e19677bc284ab16a6f03e80ca88
-timeCreated: 1464209495
+timeCreated: 1464281370
 licenseType: Free
 ModelImporter:
   serializedVersion: 19

Assets/RoomPlane.fbx.meta

@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 0301f0a3f1c387140a351a9dbc852faa
+timeCreated: 1464281370
+licenseType: Free
+ModelImporter:
+  serializedVersion: 19
+  fileIDToRecycleName:
+    100000: Room
+    100002: //RootNode
+    100004: SM_Door
+    100006: SM_DoorFrame
+    100008: SM_WindowFrame.000
+    100010: SM_WindowFrame.001
+    400000: Room
+    400002: //RootNode
+    400004: SM_Door
+    400006: SM_DoorFrame
+    400008: SM_WindowFrame.000
+    400010: SM_WindowFrame.001
+    2300000: Room
+    2300002: SM_Door
+    2300004: SM_DoorFrame
+    2300006: SM_WindowFrame.000
+    2300008: SM_WindowFrame.001
+    3300000: Room
+    3300002: SM_Door
+    3300004: SM_DoorFrame
+    3300006: SM_WindowFrame.000
+    3300008: SM_WindowFrame.001
+    4300000: SM_WindowFrame.000
+    4300002: SM_WindowFrame.001
+    4300004: Room
+    4300006: SM_Door
+    4300008: SM_DoorFrame
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleRotations: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/WarehouseColumn.cs

@@ -30,6 +30,8 @@ public class WarehouseColumn : MonoBehaviour {
             distance = Mathf.Repeat(distance, curve.length);
             var pos = curve.GetUniformPointAtDistance(distance);
             row.position = pos;
+            //var dir = curve.GetDirectionAtDistance(distance);
+            //row.LookAt(pos + dir);
         }
     }
 }