Commit b930289a authored by Le Testeur De L'Epique's avatar Le Testeur De L'Epique

Merge branch 'develop' into art/global

parents 4f3a08cf eaf0e60b
......@@ -778,7 +778,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -797,7 +797,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -816,7 +816,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -912,7 +912,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -931,7 +931,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -950,7 +950,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1009,7 +1009,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1028,7 +1028,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1047,7 +1047,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1143,7 +1143,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1162,7 +1162,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1181,7 +1181,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.1960784
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......
......@@ -778,7 +778,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -797,7 +797,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 0.67451
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -816,7 +816,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 0.3882353
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -912,7 +912,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -931,7 +931,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 0.67451
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -950,7 +950,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19608
value: 0.3882353
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1009,7 +1009,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1028,7 +1028,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 0.6745098
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1047,7 +1047,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 0.3882353
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1143,7 +1143,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1162,7 +1162,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 0.6745098
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -1181,7 +1181,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.19607843
value: 0.3882353
inSlope: 0
outSlope: 0
tangentMode: 136
......
fileFormatVersion: 2
guid: 2d3be5463eba55445b49d638ca8b4214
guid: 971ab8539aac411479f2203976c8b78c
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
fileFormatVersion: 2
guid: 5b3df1df8909e8149b4035dd5b04051d
guid: eed31b4e729151f4690cf0655ee23ab0
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
# This file uses centimeters as units for non-parametric coordinates.
mtllib Asteroide.mtl
g default
v 183.463745 383.681549 -405.462128
v 273.576050 438.706390 -337.170227
v 149.043884 472.713593 -337.170227
v 72.078796 383.681549 -337.170227
v 149.043884 294.649506 -337.170227
v 273.576050 328.656708 -337.170227
v 294.848694 383.681549 -201.901184
v 217.883606 472.713593 -201.901184
v 93.351440 438.706390 -226.671631
v 93.351440 328.656708 -226.671631
v 217.883606 294.649506 -226.671631
v 183.463745 383.681549 -183.150177
vt 1.000000 0.500000
vt 1.088104 0.823792
vt 0.838104 0.676208
vt 1.176208 0.500000
vt 1.088104 0.176208
vt 0.838104 0.323792
vt 0.588104 0.823792
vt 0.088104 0.823792
vt 0.176208 0.500000
vt 0.338104 0.676208
vt 0.088104 0.176208
vt 0.338104 0.323792
vt 0.588104 0.176208
vt 0.676208 0.500000
vt 0.500000 0.500000
vn 0.175027 0.640937 -0.747373
vn 0.175027 0.640937 -0.747373
vn 0.175027 0.640937 -0.747373
vn -0.476325 0.411767 -0.776893
vn -0.476325 0.411767 -0.776893
vn -0.476325 0.411767 -0.776893
vn -0.476325 -0.411767 -0.776893
vn -0.476325 -0.411767 -0.776893
vn -0.476325 -0.411767 -0.776893
vn 0.175027 -0.640937 -0.747373
vn 0.175027 -0.640937 -0.747373
vn 0.175027 -0.640937 -0.747373
vn 0.603998 0.000000 -0.796986
vn 0.603998 0.000000 -0.796986
vn 0.603998 0.000000 -0.796986
vn 0.261098 0.956123 -0.132876
vn 0.261098 0.956123 -0.132875
vn 0.261098 0.956123 -0.132875
vn -0.744545 0.643633 -0.177173
vn -0.744545 0.643633 -0.177173
vn -0.744545 0.643633 -0.177173
vn -0.744545 -0.643633 -0.177173
vn -0.744545 -0.643633 -0.177173
vn -0.744545 -0.643633 -0.177173
vn 0.259956 -0.951943 -0.161951
vn 0.259956 -0.951943 -0.161951
vn 0.259956 -0.951943 -0.161951
vn 0.987859 0.000000 -0.155352
vn 0.987859 0.000000 -0.155352
vn 0.987859 0.000000 -0.155352
vn 0.748463 0.647021 0.145491
vn 0.748463 0.647021 0.145491
vn 0.748463 0.647021 0.145491
vn -0.287583 0.946508 0.146354
vn -0.287583 0.946508 0.146354
vn -0.287583 0.946508 0.146354
vn -0.981969 0.000000 0.189044
vn -0.981969 0.000000 0.189044
vn -0.981969 0.000000 0.189044
vn -0.259956 -0.951943 0.161951
vn -0.259956 -0.951943 0.161951
vn -0.259956 -0.951943 0.161951
vn 0.724618 -0.670597 0.158831
vn 0.724618 -0.670597 0.158831
vn 0.724618 -0.670597 0.158831
vn 0.164325 0.142053 0.976124
vn 0.164325 0.142053 0.976124
vn 0.164325 0.142053 0.976124
vn -0.263303 0.295224 0.918431
vn -0.263303 0.295224 0.918431
vn -0.263303 0.295224 0.918431
vn -0.434902 0.000000 0.900478
vn -0.434902 0.000000 0.900478
vn -0.434902 0.000000 0.900478
vn -0.129854 -0.475517 0.870070
vn -0.129854 -0.475517 0.870070
vn -0.129854 -0.475517 0.870070
vn 0.153173 -0.385559 0.909880
vn 0.153173 -0.385559 0.909880
vn 0.153173 -0.385559 0.909880
s off
g polySurface3 pPlatonic7
usemtl lambert6SG
f 1/1/1 3/2/2 2/3/3
f 1/1/4 4/4/5 3/2/6
f 1/1/7 5/5/8 4/4/9
f 1/1/10 6/6/11 5/5/12
f 1/1/13 2/3/14 6/6/15
f 2/3/16 3/2/17 8/7/18
f 3/8/19 4/9/20 9/10/21
f 4/9/22 5/11/23 10/12/24
f 5/5/25 6/6/26 11/13/27
f 6/6/28 2/3/29 7/14/30
f 2/3/31 8/7/32 7/14/33
f 3/8/34 9/10/35 8/7/36
f 4/9/37 10/12/38 9/10/39
f 5/11/40 11/13/41 10/12/42
f 6/6/43 7/14/44 11/13/45
f 7/14/46 8/7/47 12/15/48
f 8/7/49 9/10/50 12/15/51
f 9/10/52 10/12/53 12/15/54
f 10/12/55 11/13/56 12/15/57
f 11/13/58 7/14/59 12/15/60
fileFormatVersion: 2
guid: 78ca259c1e5b5c7498352c6a3db0bf6b
ModelImporter:
serializedVersion: 19301
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 05777898a1394bc47ae236b2d7f0a551
guid: f25a2735a8e10704d8890d4d618c7fa3
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
fileFormatVersion: 2
guid: 8d61886c1791e684bb30b9c3d73241e8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 2
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 281c3120a534eb94db61fd44dede6061
guid: 0f018679f1949a84892e8ac610ae4d87
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
fileFormatVersion: 2
guid: 4e4f09118f8b42845a6fc0b63945d191
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c567842790ef68741ab782be4a08ec0c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cb3768400b7c41245af1005b61b834d6
folderAsset: yes
DefaultImporter: