Browse Source

Changes made when meeting in group. Toon shading and level design

master
Joshua Reason 9 years ago
parent
commit
35905cc32d
19 changed files with 382 additions and 1 deletions
  1. BIN
      Level1.fbx
  2. +9
    -0
      unity_Project/Assets/0bjects/Terrain.meta
  3. BIN
      unity_Project/Assets/0bjects/Terrain/shack-level.fbx
  4. +77
    -0
      unity_Project/Assets/0bjects/Terrain/shack-level.fbx.meta
  5. BIN
      unity_Project/Assets/0bjects/Textures/rust.png
  6. +55
    -0
      unity_Project/Assets/0bjects/Textures/rust.png.meta
  7. BIN
      unity_Project/Assets/0bjects/bucket.fbx
  8. +74
    -0
      unity_Project/Assets/0bjects/bucket.fbx.meta
  9. +1
    -1
      unity_Project/Assets/Scripts/magnetGun.cs
  10. BIN
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat
  11. BIN
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat
  12. BIN
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd
  13. +56
    -0
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd.meta
  14. BIN
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png
  15. +55
    -0
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png.meta
  16. BIN
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png
  17. +55
    -0
      unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png.meta
  18. BIN
      unity_Project/Assets/_Scenes/ScafoldingTest.unity
  19. BIN
      unity_Project/ProjectSettings/InputManager.asset

BIN
Level1.fbx View File


+ 9
- 0
unity_Project/Assets/0bjects/Terrain.meta View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 97cd24011c7c785478004912692c5f76
folderAsset: yes
timeCreated: 1440740094
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/0bjects/Terrain/shack-level.fbx View File


+ 77
- 0
unity_Project/Assets/0bjects/Terrain/shack-level.fbx.meta View File

@ -0,0 +1,77 @@
fileFormatVersion: 2
guid: 0a9cf0522e1177844a8be49053b20f4b
timeCreated: 1440740102
licenseType: Free
ModelImporter:
serializedVersion: 18
fileIDToRecycleName:
100000: pPlane1
100002: //RootNode
400000: pPlane1
400002: //RootNode
2300000: pPlane1
3300000: pPlane1
4300000: pPlane1
9500000: //RootNode
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1000
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
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/0bjects/Textures/rust.png View File

Before After
Width: 2480  |  Height: 3508  |  Size: 5.3 MiB

+ 55
- 0
unity_Project/Assets/0bjects/Textures/rust.png.meta View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 062f751d246b079479a1d1a6c1fc8a09
timeCreated: 1440737403
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: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
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
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: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/0bjects/bucket.fbx View File


+ 74
- 0
unity_Project/Assets/0bjects/bucket.fbx.meta View File

@ -0,0 +1,74 @@
fileFormatVersion: 2
guid: 7af8345f65cd39545a94b5554bbc823b
timeCreated: 1440738395
licenseType: Free
ModelImporter:
serializedVersion: 18
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: dump_container4
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .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
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

+ 1
- 1
unity_Project/Assets/Scripts/magnetGun.cs View File

@ -138,7 +138,7 @@ public class magnetGun : MonoBehaviour {
GravityTarget = null; GravityTarget = null;
playerController.movementSpeed = 1000.0f;
playerController.movementSpeed = 5000.0f;
playerController.cameraSpeedX = 250.0f; playerController.cameraSpeedX = 250.0f;
playerController.cameraSpeedY = 120.0f; playerController.cameraSpeedY = 120.0f;

BIN
unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonBasicOutline.mat View File


BIN
unity_Project/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLitOutline.mat View File


BIN
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd View File


+ 56
- 0
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_TEST.psd.meta View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: f48eebd62538e2e40a8ae74a1be4d018
timeCreated: 1440738706
licenseType: Free
TextureImporter:
fileIDToRecycleName:
8900000: generatedCubemap
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: 1
cubemapConvolution: 0
cubemapConvolutionSteps: 8
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
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:

BIN
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png View File

Before After
Width: 128  |  Height: 128  |  Size: 6.5 KiB

+ 55
- 0
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/ToonLit_Test.png.meta View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 8fbbf23bb3a45d2469ef7fe5f841e2ad
timeCreated: 1440738635
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: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
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
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: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png View File

Before After
Width: 256  |  Height: 2  |  Size: 229 B

+ 55
- 0
unity_Project/Assets/Standard Assets/Effects/ToonShading/Textures/UtilToonGradient_Test.png.meta View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 76c065827007be54f91a33657df18252
timeCreated: 1440739507
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: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
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
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: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

BIN
unity_Project/Assets/_Scenes/ScafoldingTest.unity View File


BIN
unity_Project/ProjectSettings/InputManager.asset View File


Loading…
Cancel
Save