浏览代码

Merge remote-tracking branch 'refs/remotes/origin/master' into Add-uv2-control

/main
Sebastien Lagarde 8 年前
当前提交
0c1762ae
共有 3 个文件被更改,包括 134 次插入4 次删除
  1. 7
      Assets/ScriptableRenderLoop/HDRenderLoop/Sky/ProceduralSky/ProceduralSkyRenderer.cs
  2. 48
      Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Plane_NoRot.FBX
  3. 83
      Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Plane_NoRot.FBX.meta

7
Assets/ScriptableRenderLoop/HDRenderLoop/Sky/ProceduralSky/ProceduralSkyRenderer.cs


m_ProceduralSkyMaterial.SetFloat("_WorldMieDensity", -param.worldMieDensity / 100000f);
m_ProceduralSkyMaterial.SetFloat("_HeightMieDensity", -param.heightMieDensity / 100000f);
// TODO : We can't pass the camera in builtinParams because when SkyManager call RenderSky for rendering into a cubemap we don't have an actual Camera.
// Maybe pass the rect/viewport directly?
var pixelRect = Camera.current ? Camera.current.pixelRect
: new Rect(0f, 0f, Screen.width, Screen.height);
//var pixelRect = Camera.current ? Camera.current.pixelRect
// : new Rect(0f, 0f, Screen.width, Screen.height);
var pixelRect = new Rect(0f, 0f, builtinParams.screenSize.x, builtinParams.screenSize.y);
var scale = 1.0f; //(float)(int)occlusionDownscale;
var depthTextureScaledTexelSize = new Vector4(scale / pixelRect.width,
scale / pixelRect.height,

48
Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Plane_NoRot.FBX


Kaydara FBX Binary LB FBXHeaderExtensiontFBXHeaderVersionI��
FBXVersionIL�EncryptionTypeI)CreationTimeStampVersionI�9YearI�\MonthI }DayI�HourI�MinuteI9�SecondI MillisecondIDp'CreatorS"FBX SDK/FBX Plugins version 2016.0) ' SceneInfoSGlobalInfoSceneInfoSUserData� TypeSUserDataVersionIdDMetaDataNVersionIdqTitleS�SubjectS�AuthorS�KeywordsSRevisionS+CommentS Properties70�EPS DocumentUrlSKStringSUrlSSU:\Temp\Plane_NoRot.FBX*HPSSrcDocumentUrlSKStringSUrlSSU:\Temp\Plane_NoRot.FBXh$PSOriginalSCompoundSS�BPSOriginal|ApplicationVendorSKStringSSSAutodesk?PSOriginal|ApplicationNameSKStringSSS3ds Maxv?PSOriginal|ApplicationVersionSKStringSSS2014�MPSOriginal|DateTime_GMTSDateTimeSSS25/11/2016 14:57:19.835?HPSOriginal|FileNameSKStringSSSU:\Temp\Plane_NoRot.FBX~%PS LastSavedSCompoundSS�CPSLastSaved|ApplicationVendorSKStringSSSAutodesk5@PSLastSaved|ApplicationNameSKStringSSS3ds Max�@PSLastSaved|ApplicationVersionSKStringSSS2014�NPSLastSaved|DateTime_GMTSDateTimeSSS25/11/2016 14:57:19.835v FileIdR)�#��(�Ƚɲ!� ���  CreationTimeS2016-11-25 15:57:19:836
6CreatorS1FBX SDK/FBX Plugins version 2016.0 build=20150119�GlobalSettingsY
VersionI�� Properties70�
)PSUpAxisSintSIntegerSI -PS
UpAxisSignSintSIntegerSIN ,PS FrontAxisSintSIntegerSI� 0PS FrontAxisSignSintSIntegerSI����� ,PS CoordAxisSintSIntegerSI( 0PS CoordAxisSignSintSIntegerSIs 1PSOriginalUpAxisSintSIntegerSI� 5PSOriginalUpAxisSignSintSIntegerSI 8PSUnitScaleFactorSdoubleSNumberSDY@n @PSOriginalUnitScaleFactorSdoubleSNumberSDk��Y@� HPS AmbientColorSColorRGBSColorSDDD+APS DefaultCameraSKStringSSSProducer Perspectivej%PSTimeModeSenumSSI�)PS TimeProtocolSenumSSI�,PSSnapOnFrameModeSenumSSI@3PS TimeSpanStartSKTimeSTimeSL�2PS TimeSpanStopSKTimeSTimeSL�y]�#�8PSCustomFrameRateSdoubleSNumberSD��&PS
TimeMarkerSCompoundSSl4PSCurrentTimeMarkerSintSIntegerSI����C Documents�CountI*DocumentLp�5�SSScene� Properties70�&PS SourceObjectSobjectSS�3PSActiveAnimStackNameSKStringSSS RootNodeL
References�3 Definitions�VersionId�CountI]
ObjectTypeSGlobalSettingsDCountI�
ObjectTypeSAnimationStack�CountI�PropertyTemplateS FbxAnimStack� Properties70Z+PS DescriptionSKStringSSS�0PS
LocalStartSKTimeSTimeSL�/PS LocalStopSKTimeSTimeSL;4PSReferenceStartSKTimeSTimeSL�3PS ReferenceStopSKTimeSTimeSLP
ObjectTypeSAnimationLayer,CountI7PropertyTemplateS FbxAnimLayer Properties70�*PSWeightSNumberSSADY@
!PSMuteSboolSSIE!PSSoloSboolSSI�!PSLockSboolSSI�APSColorSColorRGBSColorSD�������?D�������?D�������?&PS BlendModeSenumSSIj5PSRotationAccumulationModeSenumSSI�2PSScaleAccumulationModeSenumSSI5PSBlendModeBypassS ULongLongSSL�0
ObjectTypeSModel�CountI�0 PropertyTemplateSFbxNodei0 Properties70F2PSQuaternionInterpolateSenumSSI�KPSRotationOffsetSVector3DSVectorSDDDJPS RotationPivotSVector3DSVectorSDDDsJPS ScalingOffsetSVector3DSVectorSDDD�IPS ScalingPivotSVector3DSVectorSDDD.PSTranslationActiveSboolSSI�KPSTranslationMinSVector3DSVectorSDDD�KPSTranslationMaxSVector3DSVectorSDDD.,PSTranslationMinXSboolSSIt,PSTranslationMinYSboolSSI�,PSTranslationMinZSboolSSI,PSTranslationMaxXSboolSSIF,PSTranslationMaxYSboolSSI�,PSTranslationMaxZSboolSSI�*PS RotationOrderSenumSSI 6PSRotationSpaceForLimitOnlySboolSSIu;PSRotationStiffnessXSdoubleSNumberSD�;PSRotationStiffnessYSdoubleSNumberSD ;PSRotationStiffnessZSdoubleSNumberSDi 0PSAxisLenSdoubleSNumberSD$@� HPS PreRotationSVector3DSVectorSDDD.!IPS PostRotationSVector3DSVectorSDDDs!+PSRotationActiveSboolSSI�!HPS RotationMinSVector3DSVectorSDDD7"HPS RotationMaxSVector3DSVectorSDDDz")PS RotationMinXSboolSSI�")PS RotationMinYSboolSSI#)PS RotationMinZSboolSSIC#)PS RotationMaxXSboolSSI�#)PS RotationMaxYSboolSSI�#)PS RotationMaxZSboolSSI $(PS InheritTypeSenumSSIO$*PS ScalingActiveSboolSSI�$GPS
ScalingMinSVector3DSVectorSDDD%GPS
ScalingMaxSVector3DSVectorSD�?D�?D�?S%(PS ScalingMinXSboolSSI�%(PS ScalingMinYSboolSSI�%(PS ScalingMinZSboolSSI&(PS ScalingMaxXSboolSSI[&(PS ScalingMaxYSboolSSI�&(PS ScalingMaxZSboolSSI'QPSGeometricTranslationSVector3DSVectorSDDDp'NPSGeometricRotationSVector3DSVectorSDDD�'MPSGeometricScalingSVector3DSVectorSD�?D�?D�?'(6PS MinDampRangeXSdoubleSNumberSDw(6PS MinDampRangeYSdoubleSNumberSD�(6PS MinDampRangeZSdoubleSNumberSD)6PS MaxDampRangeXSdoubleSNumberSDg)6PS MaxDampRangeYSdoubleSNumberSD�)6PS MaxDampRangeZSdoubleSNumberSD
*9PSMinDampStrengthXSdoubleSNumberSD]*9PSMinDampStrengthYSdoubleSNumberSD�*9PSMinDampStrengthZSdoubleSNumberSD+9PSMaxDampStrengthXSdoubleSNumberSDV+9PSMaxDampStrengthYSdoubleSNumberSD�+9PSMaxDampStrengthZSdoubleSNumberSD�+7PSPreferedAngleXSdoubleSNumberSDK,7PSPreferedAngleYSdoubleSNumberSD�,7PSPreferedAngleZSdoubleSNumberSD�,(PSLookAtPropertySobjectSS"-*PSUpVectorPropertySobjectSS]-!PSShowSboolSSI�-8PSNegativePercentShapeSupportSboolSSI.8PSDefaultAttributeIndexSintSIntegerSI����>.#PSFreezeSboolSSI{.#PSLODBoxSboolSSI�.NPSLcl TranslationSLcl TranslationSSADDDE/HPS Lcl RotationS Lcl RotationSSADDD�/FPS Lcl ScalingS Lcl ScalingSSAD�?D�?D�?�/2PS
VisibilityS
VisibilitySSAD�?P0EPSVisibility InheritanceSVisibility InheritanceSSI}3
ObjectTypeSGeometry�0CountId3 PropertyTemplateSFbxMeshK3 Properties70�1APSColorSColorRGBSColorSD�������?D�������?D�������?2DPSBBoxMinSVector3DSVectorSDDD_2DPSBBoxMaxSVector3DSVectorSDDD�2/PSPrimary VisibilitySboolSSI�2*PS Casts ShadowsSboolSSI23,PSReceive ShadowsSboolSSI�fObjects;`!GeometryL� �S
GeometrySMesh�4 Properties70x4APSColorSColorRGBSColorSD�?D�?D�?7eVerticesdKX@$@���#� = $@���� �U��$@�cU�>@�U�����#@`@�+�����#@@$@@�U��`@���#���U�>@@����=@�cU�>@�U�����@@@@�U�����@ $@�+���cU�>$�`�U�>�cU�>�`�U�>�cU��@`�U���cU��$@`�U������ $��+�>����@�@�U�>��cU��@�U�>@����@�`����#@��U�����#�@$�@�U�>���#�`��+�>$��cU��@�U�> $����@ �U�>@$����#@ �O8 PolygonVertexIndexi@������������ ���� ���� ���� ���� ����
���� ���� ���� ��������������������9�Edgesi(�
 #"!&%*).-32165:9>=G9GeometryVersionI|k=LayerElementNormalI�9VersionIf�9NameS:MappingInformationTypeSByPolygonVertex=: ReferenceInformationTypeSDirect$;�Normalsd��x��� �@ D]
��K�%��^��-eK�"ṌxZ���b��&Q""���9"f����e;��������O�5O�=��)��'��_=�Q?�8�ۊ{o�����鰏r�O�<� ?y�;+G���{s�r�}���=��C�<+��� z&�}����Ч�g=�� �77����u����������r���1���c�R= NormalsWd@�BLayerElementBinormalI�=VersionIf�=NameS UVChannel_12>MappingInformationTypeSByPolygonVertexn> ReferenceInformationTypeSDirect�@ Binormalsd��xs�0Y4sf����Aཽ���]K����쟨ڸo-T|M�:�2����V�.]����uw>]��Xw���3���1��Q�^|����5���%W��&�; 5'w᫛ spً˜sͿ�����́��}�Zv�����n�9s��CP�#�����^\�8��sl���}!P� ڞO�#d8���3S��C�����
�e/�p��ߞ���a������_���d�ʷ=����b�c)H�9������ޫg��qC�eZ��d.{q��˿[=`:{fƾ�!��}Z��|\��2W8�h��w�̜}��@�����d>.{q�.�.5��w��}3���*� d���E��������V����p��� �Ջfvﳄ�3���<�\��2�%�k�����UA�/��ud>.{q��+�����CN�������� �#�ʫ�Ð��-?N��G\�������w��)A�疘? A���^\���o&����K��%\��2W8˺},A.�vu@�%\�����B 
BinormalsWd@�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?UHLayerElementTangentI3CVersionIf`CNameS UVChannel_1�CMappingInformationTypeSByPolygonVertex�C ReferenceInformationTypeSDirect F Tangentsd�x;�����J�2��ԥ����B�����E�6�mZ|cH�*^�/b���e���� ��bΕo[��93�NI~�!|���ߎ0�H�I�9�nu���&ڕNj�-�c/.s�@��)���ظ��`t�ȜCP��l�7͜9���rGu�8.{q�5�Jt���3;��*%�A��C͏�,x{����#�R���n��y���k .��N���_
7��v�^�����H�9��� �WD��Ϋg���wE����^\��
��!鄋{��33쬳�/���e/.s`�E�] �?9}����9v�s����0s�� �gB��M��ཻ'�=���d�=4��%BM����$O��n��k 5�F��|��n�5�>���e/.sp��
j����aiimv�Y[A����9���u��o@�p+4��W����y��k��S��a��&4?�VJ��n��� M���Hr~}7��a1�(~qً�\���� u��mO+ȝ���e�p����k� @��m�D7�|\��S�<H  TangentsWd@�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?�?WLLayerElementUVI�HVersionIe�HNameS UVChannel_1IMappingInformationTypeSByPolygonVertexYIReferenceInformationTypeS IndexToDirectK�UVd2�����?`>����?�?����?����?�?����?�?����?����?`>����?�?�?����?�?����?�?����?����?p>����? �?�?�?�?�? �?����?�?x>�?@�? �?�?@�?�?@�?�?`>x>`>@�?p> �?x>�?x>�?>L UVIndexi@ 
   
   YPLayerElementUVI�LVersionIe�LNameS UVChannel_2MMappingInformationTypeSByPolygonVertex[MReferenceInformationTypeS IndexToDirectO�UVd2�����?��¿`���?W����x�?���?@g��?Λ�?��@�?����?Λ�?���?��o�?@6��?�t��?���?��@�?��o�?���?`���?���?�,�?���?@��?�?�?�}��?�t��? ��?��x�?W���� �?@6��?���?@��?�}��?���?��@�?@�L�?@g��?��¿`��?���?@�L�?�,�? ��?�� �?���?`��?��@�?@P UVIndexi@ 
   
   [TLayerElementUVI�PVersionIe�PNameS UVChannel_3QMappingInformationTypeSByPolygonVertex]QReferenceInformationTypeS IndexToDirectS�UVd2�@���?�{��`���?u�Կ`�%�?�>�?`�q�?@J��?����?@���?@J��?�����@���?��ƿ@���?����?@���?@���?@+�?`���?�>�?��K������?&\���?�?<��?@���? x0�?`�%�?u�Կ��fۿ��ƿ�͓�?&\��<��?�͓�?@���?�k�?`�q�?�{��@6ҿ������k�?��K�� x0�?��fۿ@+�?@6ҿ����?BT UVIndexi@ 
   
   ]XLayerElementUVI�TVersionIe�TNameS UVChannel_4UMappingInformationTypeSByPolygonVertex_UReferenceInformationTypeS IndexToDirectW�UVd2�V�?��������?�������?�� ȿ�H@@D�?�^@V�?@D�?�#���V�?{!ܿ�ć�?�0��?�^�?V�?����?����?�� ȿ����0��?N|���?�?�3�?�ć�?�3�?���?������;ֿ{!ܿ@���?N|���3�?@���?�^�?����?�H@������l��#�������?����3�?��;ֿ����?��l��^@DX UVIndexi@ 
   
   �YLayerElementSmoothingI�XVersionIf�XNameSYMappingInformationTypeS ByPolygonPY ReferenceInformationTypeSDirect�YM Smoothingi@=]LayerI ZVersionId�Z LayerElementyZTypeSLayerElementNormal�Z
TypedIndexIV[ LayerElement[TypeSLayerElementBinormal=[
TypedIndexI�[ LayerElement�[TypeSLayerElementTangent�[
TypedIndexI�\ LayerElementM\TypeSLayerElementSmoothingu\
TypedIndexI$] LayerElement�\TypeSLayerElementUV ]
TypedIndexI4^LayerI�]VersionId^ LayerElement�]TypeSLayerElementUV^
TypedIndexI+_LayerI|^VersionId_ LayerElement�^TypeSLayerElementUV�^
TypedIndexI"`LayerIs_VersionId ` LayerElement�_TypeSLayerElementUV�_
TypedIndexI;e)ModelL�kSPlane_NoRotModelSMesh�`VersionI��d Properties70a(PS InheritTypeSenumSSIoaGPS
ScalingMaxSVector3DSVectorSDDD�a8PSDefaultAttributeIndexSintSIntegerSIbBPS#mr displacement use global settingsSBoolSSAUItb=PSmr displacement view dependentSBoolSSAUI�bBPSmr displacement methodSIntegerSSAUIII%c;PSmr displacement smoothing onSBoolSSAUI�cRPSmr displacement edge lengthSNumberSSAUD@D@D@�cSPSmr displacement max displaceSNumberSSAUD4@D4@D4@pdXPS,mr displacement parametric subdivision levelSIntegerSSAUIII�d.PS MaxHandleSintSIntegerSUHI �dShadingCT"eCullingS
CullingOffuf&AnimationStackL�߭jSTake 001AnimStackS\f Properties70�e/PS LocalStopSKTimeSTimeSL�y]�#Cf3PS ReferenceStopSKTimeSTimeSL�y]�#�f'AnimationLayerL0~i�SBaseLayerAnimLayerS�g ConnectionsLgCSOOL�kLgCSOOL0~i�L�߭j�gCSOOL� �L�kiTakeshCurrentS�h TakeSTake 001jhFileNameS Take_001.tak�h LocalTimeLL�y]�#�h ReferenceTimeLL�y]�#������k�q���$xL�Z�j���~�� �u�)

83
Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Plane_NoRot.FBX.meta


fileFormatVersion: 2
guid: 4728f0e7b47aa304692c028e76915b5f
timeCreated: 1481280238
licenseType: Pro
ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Plane_NoRot
9500000: //RootNode
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
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: 2
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存