Skip to content

Commit 5f13f60

Browse files
committedNov 19, 2019
Add Sein_cubeTexture and Sein_skybox
1 parent adb3470 commit 5f13f60

36 files changed

+866
-216
lines changed
 

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ project/Assets/main
1111
project/.vs
1212
project/obj
1313
project/Assets/temp*
14+
project/Assets/Test
15+
project/Assets/Test.meta
1416
project/sein-previewer-temp-assets
1517
project/Assets/Resources/3d-museam

‎project/.vs/project/xs/UserPrefs.xml

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<Properties StartupConfiguration="{7CA597AC-799E-2D81-E8A0-0EA9A568434E}|">
2-
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/SeinJSUnityToolkit/Common/Config.cs">
2+
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_skyboxExtensionFactory.cs">
33
<Files>
4-
<File FileName="Assets/SeinJSUnityToolkit/Exporter/ExporterUtils.cs" Line="293" Column="25" />
5-
<File FileName="Assets/SeinJSUnityToolkit/Extensions/Components/SeinAtlas.cs" Line="186" Column="16" />
6-
<File FileName="Assets/SeinJSUnityToolkit/Common/Utils.cs" Line="130" Column="79" />
7-
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_imageBasedLightingExtensionFactory.cs" Line="111" Column="1" />
8-
<File FileName="Assets/SeinJSUnityToolkit/Common/Config.cs" Line="26" Column="59" />
9-
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_atlasExtensionFactory.cs" Line="76" Column="17" NotebookId="1" />
10-
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_customMaterialExtension.cs" NotebookId="1" />
4+
<File FileName="Assets/SeinJSUnityToolkit/Exporter/ExporterUtils.cs" Line="336" Column="17" />
5+
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_skyboxExtensionFactory.cs" Line="67" Column="59" />
6+
<File FileName="Assets/SeinJSUnityToolkit/Exporter/ExporterWindow.cs" Line="175" Column="1" />
7+
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_skyboxExtension.cs" Line="66" Column="2" NotebookId="1" />
8+
<File FileName="Assets/SeinJSUnityToolkit/Extensions/GLTFExtensions/Sein_imageBasedLightingExtensionFactory.cs" Line="136" Column="18" NotebookId="1" />
119
</Files>
1210
<Pads>
1311
<Pad Id="ProjectPad">
@@ -16,9 +14,16 @@
1614
<Node name="Assets" expanded="True">
1715
<Node name="SeinCustomMaterials" expanded="True" />
1816
<Node name="SeinJSUnityToolkit" expanded="True">
19-
<Node name="Common" expanded="True">
20-
<Node name="Config.cs" selected="True" />
17+
<Node name="Common" expanded="True" />
18+
<Node name="Exporter" expanded="True" />
19+
<Node name="Extensions" expanded="True">
20+
<Node name="Basic" expanded="True" />
21+
<Node name="GLTFExtensions" expanded="True">
22+
<Node name="Sein_skyboxExtensionFactory.cs" selected="True" />
23+
</Node>
2124
</Node>
25+
<Node name="Shaders" expanded="True" />
26+
<Node name="Tools" expanded="True" />
2227
</Node>
2328
</Node>
2429
</Node>

‎project/.vs/project/xs/project-cache/Assembly-CSharp-Debug.json

+1-1
Large diffs are not rendered by default.
4 KB
Binary file not shown.

‎project/Assembly-CSharp.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_audioListenerExtensionFactory.cs" />
124124
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_audioSourceExtension.cs" />
125125
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_audioSourceExtensionFactory.cs" />
126+
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_cubeTextureExtension.cs" />
127+
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_cubeTextureExtensionFactory.cs" />
126128
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_customMaterialExtension.cs" />
127129
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_customMaterialExtensionFactory.cs" />
128130
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_imageBasedLightingExtension.cs" />
@@ -133,6 +135,8 @@
133135
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_physicBodyExtensionFactory.cs" />
134136
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_rendererExtension.cs" />
135137
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_rendererExtensionFactory.cs" />
138+
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_skyboxExtension.cs" />
139+
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_skyboxExtensionFactory.cs" />
136140
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_spriteExtension.cs" />
137141
<Compile Include="Assets\SeinJSUnityToolkit\Extensions\GLTFExtensions\Sein_spriteExtensionFactory.cs" />
138142
<Compile Include="Assets\SeinJSUnityToolkit\Importer\AssetSerializer.cs" />

‎project/Assets/Demos/Basic.unity

-9
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ GameObject:
430430
m_Component:
431431
- component: {fileID: 1242132902}
432432
- component: {fileID: 1242132901}
433-
- component: {fileID: 1242132900}
434433
- component: {fileID: 1242132903}
435434
m_Layer: 0
436435
m_Name: Camera
@@ -439,14 +438,6 @@ GameObject:
439438
m_NavMeshLayer: 0
440439
m_StaticEditorFlags: 0
441440
m_IsActive: 1
442-
--- !u!81 &1242132900
443-
AudioListener:
444-
m_ObjectHideFlags: 0
445-
m_CorrespondingSourceObject: {fileID: 0}
446-
m_PrefabInstance: {fileID: 0}
447-
m_PrefabAsset: {fileID: 0}
448-
m_GameObject: {fileID: 1242132899}
449-
m_Enabled: 1
450441
--- !u!20 &1242132901
451442
Camera:
452443
m_ObjectHideFlags: 0

‎project/Assets/Demos/ReflectionMap.unity

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 8900000, guid: cd2b0d52a9c164817a37593c0d71a467, type: 3}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.14374904, g: 0.13064043, b: 0.12854356, a: 1}
41+
m_IndirectSpecularColor: {r: 1.2132033, g: 1.1026992, b: 1.0850002, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -403,7 +403,7 @@ Camera:
403403
m_GameObject: {fileID: 1611674952}
404404
m_Enabled: 1
405405
serializedVersion: 2
406-
m_ClearFlags: 2
406+
m_ClearFlags: 1
407407
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
408408
m_projectionMatrixMode: 1
409409
m_GateFitMode: 2

‎project/Assets/Resources/Skybox.mat

+85-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Skybox
11-
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
11+
m_Shader: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords: _MAPPING_LATITUDE_LONGITUDE_LAYOUT _SUNDISK_HIGH_QUALITY
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
@@ -19,6 +19,10 @@ Material:
1919
m_SavedProperties:
2020
serializedVersion: 3
2121
m_TexEnvs:
22+
- _BackTex:
23+
m_Texture: {fileID: 2800000, guid: f0f76618908e9c340ad4d92d9f62533d, type: 3}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
2226
- _BumpMap:
2327
m_Texture: {fileID: 0}
2428
m_Scale: {x: 1, y: 1}
@@ -35,12 +39,24 @@ Material:
3539
m_Texture: {fileID: 0}
3640
m_Scale: {x: 1, y: 1}
3741
m_Offset: {x: 0, y: 0}
42+
- _DownTex:
43+
m_Texture: {fileID: 2800000, guid: d0a1e6596404a4e1e823fa54c9ab3516, type: 3}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
3846
- _EmissionMap:
3947
m_Texture: {fileID: 0}
4048
m_Scale: {x: 1, y: 1}
4149
m_Offset: {x: 0, y: 0}
50+
- _FrontTex:
51+
m_Texture: {fileID: 2800000, guid: 429265231c4dd6b42940ae44377fd481, type: 3}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _LeftTex:
55+
m_Texture: {fileID: 2800000, guid: 429265231c4dd6b42940ae44377fd481, type: 3}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
4258
- _MainTex:
43-
m_Texture: {fileID: 0}
59+
m_Texture: {fileID: 2800000, guid: cf8af5b371c8f497a8a81010ed79c194, type: 3}
4460
m_Scale: {x: 1, y: 1}
4561
m_Offset: {x: 0, y: 0}
4662
- _MetallicGlossMap:
@@ -55,30 +71,95 @@ Material:
5571
m_Texture: {fileID: 0}
5672
m_Scale: {x: 1, y: 1}
5773
m_Offset: {x: 0, y: 0}
74+
- _RightTex:
75+
m_Texture: {fileID: 2800000, guid: 55ffbc430fc004fd583e88ffd735d640, type: 3}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
5878
- _Tex:
5979
m_Texture: {fileID: 8900000, guid: cd2b0d52a9c164817a37593c0d71a467, type: 3}
6080
m_Scale: {x: 1, y: 1}
6181
m_Offset: {x: 0, y: 0}
82+
- _UpTex:
83+
m_Texture: {fileID: 2800000, guid: db3548be7ed76444a8cfc2c9a486f5de, type: 3}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- _baseColorMap:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
90+
- _brdfLUT:
91+
m_Texture: {fileID: 0}
92+
m_Scale: {x: 1, y: 1}
93+
m_Offset: {x: 0, y: 0}
94+
- _emissionMap:
95+
m_Texture: {fileID: 0}
96+
m_Scale: {x: 1, y: 1}
97+
m_Offset: {x: 0, y: 0}
98+
- _metallicMap:
99+
m_Texture: {fileID: 0}
100+
m_Scale: {x: 1, y: 1}
101+
m_Offset: {x: 0, y: 0}
102+
- _normalMap:
103+
m_Texture: {fileID: 0}
104+
m_Scale: {x: 1, y: 1}
105+
m_Offset: {x: 0, y: 0}
106+
- _occlusionMap:
107+
m_Texture: {fileID: 0}
108+
m_Scale: {x: 1, y: 1}
109+
m_Offset: {x: 0, y: 0}
110+
- _roughnessMap:
111+
m_Texture: {fileID: 0}
112+
m_Scale: {x: 1, y: 1}
113+
m_Offset: {x: 0, y: 0}
114+
- _specularGlossinessMap:
115+
m_Texture: {fileID: 0}
116+
m_Scale: {x: 1, y: 1}
117+
m_Offset: {x: 0, y: 0}
62118
m_Floats:
119+
- _AtmosphereThickness: 1.1
63120
- _BumpScale: 1
121+
- _Cull: 2
64122
- _Cutoff: 0.5
65123
- _DetailNormalMapScale: 1
66124
- _DstBlend: 0
67-
- _Exposure: 0.52
125+
- _Exposure: 1.36
68126
- _GlossMapScale: 1
69127
- _Glossiness: 0.5
70128
- _GlossyReflections: 1
129+
- _ImageType: 0
130+
- _Layout: 0
131+
- _Mapping: 1
71132
- _Metallic: 0
133+
- _MirrorOnBack: 0
72134
- _Mode: 0
73135
- _OcclusionStrength: 1
74136
- _Parallax: 0.02
75137
- _Rotation: 0
76138
- _SmoothnessTextureChannel: 0
77139
- _SpecularHighlights: 1
78140
- _SrcBlend: 1
141+
- _SunDisk: 2
142+
- _SunSize: 0.218
143+
- _SunSizeConvergence: 3.76
79144
- _UVSec: 0
80145
- _ZWrite: 1
146+
- _emissionUV: 0
147+
- _glossMapScale: 0
148+
- _glossiness: 1
149+
- _metallic: 0.5
150+
- _normalScale: 1
151+
- _occlusionStrength: 1
152+
- _roughness: 0
153+
- cloneForInst: 0
154+
- envReflection: 0
155+
- unlit: 0
156+
- workflow: 0
81157
m_Colors:
82158
- _Color: {r: 1, g: 1, b: 1, a: 1}
83159
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
160+
- _GroundColor: {r: 1, g: 0.2857143, b: 0, a: 1}
161+
- _SkyTint: {r: 1, g: 1, b: 1, a: 1}
84162
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
163+
- _baseColor: {r: 1, g: 1, b: 1, a: 1}
164+
- _emission: {r: 0, g: 0, b: 0, a: 0}
165+
- _specular: {r: 0.5, g: 0.5, b: 0.5, a: 1}

0 commit comments

Comments
 (0)
Please sign in to comment.