Browse Source

fixed boat height

master
Joshua Reason 7 years ago
parent
commit
d2800eef7c
20 changed files with 60 additions and 276 deletions
  1. +0
    -82
      IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta
  2. +0
    -82
      IronToad_UnityProject/Assets/Art/Models/pier.obj.meta
  3. BIN
      IronToad_UnityProject/Assets/Materials/MaskMat.mat
  4. +8
    -0
      IronToad_UnityProject/Assets/Materials/MaskMat.mat.meta
  5. BIN
      IronToad_UnityProject/Assets/Models/M_Boat.FBX
  6. +16
    -1
      IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta
  7. BIN
      IronToad_UnityProject/Assets/Models/Materials/No Name.mat
  8. BIN
      IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat
  9. +8
    -0
      IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat.meta
  10. +0
    -9
      IronToad_UnityProject/Assets/ShaderForge.meta
  11. +0
    -9
      IronToad_UnityProject/Assets/ShaderForge/Example Assets.meta
  12. BIN
      IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga
  13. +0
    -45
      IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga.meta
  14. BIN
      IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga
  15. +0
    -45
      IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga.meta
  16. +18
    -0
      IronToad_UnityProject/Assets/Shaders/DepthMask.shader
  17. +9
    -0
      IronToad_UnityProject/Assets/Shaders/DepthMask.shader.meta
  18. +1
    -3
      IronToad_UnityProject/Assets/Sound.meta
  19. BIN
      IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
  20. BIN
      IronToad_UnityProject/Assets/water/planeWater.prefab

+ 0
- 82
IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta View File

@ -1,82 +0,0 @@
fileFormatVersion: 2
guid: 919eb0dba9aa0da44aec3a80f1cf98ea
timeCreated: 1485000000
licenseType: Free
ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: lighthouse
100002: //RootNode
400000: lighthouse
400002: //RootNode
2300000: lighthouse
3300000: lighthouse
4300000: lighthouse
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 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:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 82
IronToad_UnityProject/Assets/Art/Models/pier.obj.meta View File

@ -1,82 +0,0 @@
fileFormatVersion: 2
guid: 37549450629db464abffe54861590cf3
timeCreated: 1485008673
licenseType: Free
ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: pCylinder3
100002: //RootNode
400000: pCylinder3
400002: //RootNode
2300000: pCylinder3
3300000: pCylinder3
4300000: pCylinder3
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 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:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Materials/MaskMat.mat View File


+ 8
- 0
IronToad_UnityProject/Assets/Materials/MaskMat.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 710e883f261d31a4ba94c2426f8eb901
timeCreated: 1485038326
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Models/M_Boat.FBX View File


+ 16
- 1
IronToad_UnityProject/Assets/Models/M_Boat.FBX.meta View File

@ -6,10 +6,25 @@ ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: //RootNode
100002: boat_hull
100004: boat_sail
100006: hull_mask
400000: //RootNode
400002: boat_hull
400004: boat_sail
400006: hull_mask
2300000: //RootNode
2300002: boat_hull
2300004: boat_sail
2300006: hull_mask
3300000: //RootNode
3300002: boat_hull
3300004: boat_sail
3300006: hull_mask
4300000: boat
4300002: boat_hull
4300004: boat_sail
4300006: hull_mask
9500000: //RootNode
materials:
importMaterials: 1
@ -35,7 +50,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.2
globalScale: 1
meshCompression: 0
addColliders: 0
importBlendShapes: 1

BIN
IronToad_UnityProject/Assets/Models/Materials/No Name.mat View File


BIN
IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat View File


+ 8
- 0
IronToad_UnityProject/Assets/Models/Materials/boat_LOW_defaultMat_C.mat.meta View File

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

+ 0
- 9
IronToad_UnityProject/Assets/ShaderForge.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 94220348a13529a4490aa9ee3167e649
folderAsset: yes
timeCreated: 1484980467
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 9
IronToad_UnityProject/Assets/ShaderForge/Example Assets.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 521359692b2816940bb04fd9950a9177
folderAsset: yes
timeCreated: 1484980467
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga View File

Before After

+ 0
- 45
IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_ao_height.tga.meta View File

@ -1,45 +0,0 @@
fileFormatVersion: 2
guid: 5fb7986dd6d0a8e4093ba82369dd6a4d
TextureImporter:
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: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 128
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

BIN
IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga View File

Before After

+ 0
- 45
IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures/sf_parallax_test_normals.tga.meta View File

@ -1,45 +0,0 @@
fileFormatVersion: 2
guid: cf20bfced7e912046a9ce991a4d775ec
TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 1
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 1
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 128
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: 1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

+ 18
- 0
IronToad_UnityProject/Assets/Shaders/DepthMask.shader View File

@ -0,0 +1,18 @@
Shader "Masked/Mask" {
SubShader {
// Render the mask after regular geometry, but before masked geometry and
// transparent things.
Tags {"Queue" = "Geometry+10" }
// Don't draw in the RGBA channels; just the depth buffer
ColorMask 0
ZWrite On
// Do nothing specific in the pass:
Pass {}
}
}

+ 9
- 0
IronToad_UnityProject/Assets/Shaders/DepthMask.shader.meta View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 311e51b6b1845554098afdb56d60e28f
timeCreated: 1485038290
licenseType: Free
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:

IronToad_UnityProject/Assets/ShaderForge/Example Assets/Textures.meta → IronToad_UnityProject/Assets/Sound.meta View File

@ -1,8 +1,6 @@
fileFormatVersion: 2
guid: bc6edbce34ffe84498ddcb02eb143c3e
guid: 73fb9ee280b0c75439600b4d5c3a6a7d
folderAsset: yes
timeCreated: 1484980467
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:

BIN
IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity View File


BIN
IronToad_UnityProject/Assets/water/planeWater.prefab View File


Loading…
Cancel
Save