Skip to content

Commit e47394d

Browse files
AlexThivfacebook-github-bot
authored andcommitted
Update License to MIT
Reviewed By: jasonmeisel Differential Revision: D62673195 fbshipit-source-id: 03eaef108af9f718c341797d7c2500a7b3da4936
1 parent 9434899 commit e47394d

File tree

88 files changed

+186
-1730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+186
-1730
lines changed

Assets/Audio/Editor/CustomPropertyDrawer.cs

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
using UnityEditor;
224
using UnityEngine;

Assets/Audio/Scripts/NamedArrayAttribute.cs

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
using UnityEngine;
224
//https://forum.unity.com/threads/how-to-change-the-name-of-list-elements-in-the-inspector.448910/

Assets/Editor/Build/BuildFlavors.cs

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
using System.IO;
224
using UnityEditor;

Assets/Environment/Shaders/OppyDimension.shader

+15-33
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/OppyDimension"
224
{
@@ -33,7 +15,7 @@ Shader "TheWorldBeyond/OppyDimension"
3315
_MainTex("MainTex", 2D) = "white" {}
3416
_TriPlanarFalloff("Triplanar Falloff", Range(0 , 10)) = 1
3517
_OppyPosition("Oppy Position", Vector) = (0,1000,0,0)
36-
_OppyRippleStrength("Oppy Ripple Strength", Range(0 , 1)) = 1
18+
_OppyRippleStrength("Oppy Ripple Strength", Range(0 , 1)) = 1
3719
_MaskRippleStrength("Mask Ripple Strength", Range(0, 1)) = 0
3820

3921
_Color("Color", Color) = (0,0,0,0)
@@ -57,11 +39,11 @@ Shader "TheWorldBeyond/OppyDimension"
5739
Cull Back
5840
ColorMask RGBA
5941
ZWrite On
60-
ZTest LEqual
61-
42+
ZTest LEqual
43+
6244
// the blending here (specifically the second part of each line: Min, One Zero) is what reveals Passthrough
6345
BlendOp Add, Min
64-
Blend One Zero, One Zero
46+
Blend One Zero, One Zero
6547

6648
Offset 0 , 0
6749

@@ -172,7 +154,7 @@ Shader "TheWorldBeyond/OppyDimension"
172154
{
173155
UNITY_SETUP_INSTANCE_ID(i);
174156
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i);
175-
157+
176158
// main texture
177159
half4 mainTextureTriPlanar = TriplanarSampler(_MainTex, i.worldPos, i.normalSign, i.projNormal, _MainTex_ST.xy );
178160

@@ -199,8 +181,8 @@ Shader "TheWorldBeyond/OppyDimension"
199181
// saturating with distance
200182
half3 finalColor = lerp( desaturatedColor.xxx, foggedColor, _SaturationAmount);
201183
finalColor = fastPow(finalColor, 0.455);
202-
203-
// clip out pixels when toggling walls
184+
185+
// clip out pixels when toggling walls
204186
// this allows depth writing to still happen, ensuring that transparent effects aren't visible "through" the wall
205187
float radialDist = distance(i.worldPos, _EffectPosition) * 10;
206188
float dist = saturate(radialDist + 5 - _EffectTimer * 50);
@@ -209,16 +191,16 @@ Shader "TheWorldBeyond/OppyDimension"
209191
dist = 0;
210192
}
211193
float alpha = lerp(dist, 1 - dist, _InvertedMask);
212-
clip(alpha.r - 0.5);
213-
214-
half distanceToBall = distance(_OppyPosition, i.worldPos);
194+
clip(alpha.r - 0.5);
195+
196+
half distanceToBall = distance(_OppyPosition, i.worldPos);
215197
half maskRipple = saturate(sin((distanceToBall * 20) + (_Time.w * 2)) * 0.5 + 0.25) * saturate(1 - (distanceToBall * 0.5)) * 0.7;
216198
maskRipple *= saturate((distanceToBall-0.2)*5);
217199
return half4(finalColor, maskRipple * _MaskRippleStrength);
218200
}
219-
ENDCG
220-
}
201+
ENDCG
202+
}
203+
221204

222-
223205
}
224-
}
206+
}

Assets/Environment/Shaders/PassthroughWall.shader

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/PassthroughWall" {
224
Properties

Assets/Environment/Shaders/ToonFoggy.shader

+6-24
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/ToonFoggy"
224
{
@@ -147,10 +129,10 @@ Shader "TheWorldBeyond/ToonFoggy"
147129
{
148130
UNITY_SETUP_INSTANCE_ID(i);
149131
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i);
150-
132+
151133
//main texture
152134
half4 mainTexture = tex2D(_MainTex, i.uvMain);
153-
135+
154136
//lighting
155137
half halfLambert = dot(_WorldSpaceLightPos0.xyz, i.worldNormal) * 0.5 + 0.5;
156138
half4 lightingRamp = tex2D(_LightingRamp, halfLambert.xx);
@@ -277,7 +259,7 @@ Shader "TheWorldBeyond/ToonFoggy"
277259
//fogging
278260
half4 foggedColor = lerp(finalLighting, half4 (0, 0, 0, 0), (i.foggingRange * _FogStrength));
279261

280-
262+
281263
half4 finalColor = foggedColor * coloredTexture; //fog is black, so light strength fades to 0 with depth
282264
finalColor = fastPow(finalColor, 0.455);
283265
return finalColor;
@@ -286,6 +268,6 @@ Shader "TheWorldBeyond/ToonFoggy"
286268
}
287269

288270

289-
271+
290272
}
291-
}
273+
}

Assets/Environment/Shaders/ToonFoggyClouds.shader

+4-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/ToonFoggyClouds"
224
{
@@ -138,7 +120,7 @@ Shader "TheWorldBeyond/ToonFoggyClouds"
138120
{
139121
UNITY_SETUP_INSTANCE_ID(i);
140122
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i);
141-
123+
142124
//main texture
143125
half2 uv_MainTex = i.mainTexCoords.xy * _MainTex_ST.xy + _MainTex_ST.zw;
144126
half4 mainTexture = tex2D(_MainTex, uv_MainTex);
@@ -167,7 +149,7 @@ Shader "TheWorldBeyond/ToonFoggyClouds"
167149
//saturating with distance
168150
half satDistance = saturate( (_SaturationDistance * 11) - (FoggingRange * 10) );
169151
half3 blackAndWhiteToColor = lerp(foggedColor, desaturatedColor, satDistance);
170-
152+
171153
half4 finalColor = half4(blackAndWhiteToColor.rgb, 1.0);
172154
return finalColor;
173155
}
@@ -318,4 +300,4 @@ Shader "TheWorldBeyond/ToonFoggyClouds"
318300
}
319301
*/
320302
}
321-
}
303+
}

Assets/Environment/Shaders/ToonFoggyEmissive.shader

+3-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/ToonFoggyEmissive"
224
{
@@ -157,9 +139,9 @@ Shader "TheWorldBeyond/ToonFoggyEmissive"
157139
half3 finalColor = lerp(litTexture.rgb, foggingColor.rgb, (i.foggingRange * _FogStrength));
158140
finalColor = fastPow(finalColor, 0.454);
159141
return half4(finalColor, 1.0);
160-
}
142+
}
161143
ENDCG
162144
}
163145

164146
}
165-
}
147+
}

Assets/Environment/Shaders/ToonFoggyWithDetail.shader

+4-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
/*
2-
* Copyright (c) Meta Platforms, Inc. and affiliates.
3-
* All rights reserved.
4-
*
5-
* Licensed under the Oculus SDK License Agreement (the "License");
6-
* you may not use the Oculus SDK except in compliance with the License,
7-
* which is provided at the time of installation or download, or which
8-
* otherwise accompanies this software in either electronic or hard copy form.
9-
*
10-
* You may obtain a copy of the License at
11-
*
12-
* https://developer.oculus.com/licenses/oculussdk/
13-
*
14-
* Unless required by applicable law or agreed to in writing, the Oculus SDK
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
19-
*/
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
202

213
Shader "TheWorldBeyond/ToonFoggy with detail"
224
{
@@ -152,7 +134,7 @@ Shader "TheWorldBeyond/ToonFoggy with detail"
152134
{
153135
UNITY_SETUP_INSTANCE_ID(i);
154136
UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i);
155-
137+
156138
//main texture
157139
half4 mainTexture = tex2D(_MainTex, i.uvMain);
158140
half4 detailTexture = tex2D(_DetailTex, i.uvDetail);
@@ -283,7 +265,7 @@ Shader "TheWorldBeyond/ToonFoggy with detail"
283265
FoggingRange = fastPow(FoggingRange, _FogExponent);
284266
half4 foggedColor = lerp(finalLighting, half4 (0, 0, 0, 0), (FoggingRange * _FogStrength));
285267

286-
268+
287269
half4 finalColor = foggedColor * coloredTexture; //fog is black, so light strength fades to 0 with depth
288270
finalColor = fastPow(finalColor, 0.455);
289271
return finalColor;
@@ -293,4 +275,4 @@ Shader "TheWorldBeyond/ToonFoggy with detail"
293275

294276

295277
}
296-
}
278+
}

0 commit comments

Comments
 (0)