Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/openxr support #37

Draft
wants to merge 131 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
e6b656b
Remove SteamVR
andybak Jul 17, 2024
1924724
XR Input classes from Open Brush
andybak Jul 17, 2024
76c8f63
Packages and auto-gen files
andybak Jul 17, 2024
d9b819f
Another XR actions file from Open Brush
andybak Jul 17, 2024
480aa90
Initial code modification for XR input
andybak Jul 17, 2024
498c972
Forgot to save main scene
andybak Jul 17, 2024
7c8986b
Initial stab at input mapping
andybak Jul 17, 2024
315f5c5
Project settings was updated
andybak Jul 17, 2024
593e3cc
Switch to Unity 2022 LTS. Progress with input
andybak Jul 17, 2024
ac3ff9b
Set isBrush correctly
andybak Jul 18, 2024
da64fca
Forgot what I changed in the main scene :(
andybak Jul 18, 2024
f1cc4fd
Replace dll usage with existing C# octree (fbx support broken for now)
andybak Jul 19, 2024
ede2048
Always return true for IsTrackedObjectValid (temp fix)
andybak Jul 19, 2024
18087c7
Assign OpenXR holder
andybak Jul 19, 2024
36578de
Treat OpenXR controller as a Oculus touch for now
andybak Jul 19, 2024
42ee7ce
Fix trigger animation
andybak Jul 19, 2024
ab95468
Ignore user settings folder
andybak Jul 19, 2024
fa637c4
Merge branch 'feature/remove-dll' into feature/openxr-support
andybak Jul 19, 2024
35b5a20
Switch to Unity sharpziplib
andybak Jul 19, 2024
a0ac07b
remove build file
andybak Jul 19, 2024
1b13cb9
Use the same sharpziplib as Open Brush
andybak Jul 19, 2024
5a31dae
Fix ziplib imports
andybak Jul 19, 2024
7fb4ff7
Building successfully on Quest
andybak Jul 19, 2024
2882b85
Input fixes and package updates
andybak Jul 19, 2024
81653d4
Custom touchpad logic
andybak Jul 19, 2024
00c869d
Custom manifest
andybak Jul 20, 2024
a1aa6f8
try/catch initial directory creation
andybak Jul 20, 2024
6bd5c6f
Merge remote-tracking branch 'origin/main' into feature/openxr-support
andybak Jul 24, 2024
a691cd8
Merge branch 'main' into feature/openxr-support
andybak Jul 24, 2024
2890d9e
Tool head positioning
andybak Jul 25, 2024
7cc587a
Downgrade fbx dll error to warning
andybak Jul 25, 2024
63f1106
Merge branch 'main' into feature/openxr-support
andybak Aug 13, 2024
48d023e
Merge remote-tracking branch 'origin/main' into feature/openxr-support
andybak Aug 14, 2024
cf676db
Fix broken intro shader and tweak materials
andybak Aug 15, 2024
1f6e40e
Merge branch 'main' into feature/openxr-support
andybak Aug 20, 2024
36e0bd0
Merge branch 'main' into feature/openxr-support
andybak Aug 23, 2024
e30b327
Use persistentDataPath for cache
andybak Aug 23, 2024
aa478ad
Change config app name and version (used in gltf export)
andybak Aug 23, 2024
e8bb1a5
Turn off emissive for logo materials
andybak Aug 24, 2024
2498022
Settings/quality tweaks for mobile
andybak Aug 24, 2024
45cae28
Disable fbx export
andybak Aug 24, 2024
2c4e13e
Remove pragma only_renderers
andybak Aug 25, 2024
c269ca5
Merge branch 'main' into feature/openxr-support
andybak Aug 26, 2024
bae91d8
Merge remote-tracking branch 'origin/main' into feature/openxr-support
andybak Aug 31, 2024
7f6a28d
Merge branch 'main' into feature/openxr-support
andybak Sep 20, 2024
588ab1a
try disabling custom lighting component
andybak Sep 23, 2024
578ad7c
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
andybak Sep 23, 2024
4d2eabc
Revert "try disabling custom lighting component"
andybak Sep 23, 2024
bf5f087
Fix shadows and modify tool on Quest
Sep 30, 2024
1858cc5
Run pre-commit (dotnet-format) manually
mikeage Oct 1, 2024
8b4964c
Bump Unity version
andybak Oct 2, 2024
8a6395d
Auto-graphics APIs for Windows
andybak Oct 2, 2024
e9fcff6
Add Quest to the build system (#54)
mikeage Oct 2, 2024
603465c
Try disabling fbx save entirely
andybak Oct 3, 2024
44c6828
Revert "Try disabling fbx save entirely"
andybak Oct 4, 2024
fd708d2
Fix sky sphere clipping
Oct 7, 2024
57dfab7
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Oct 7, 2024
57160ca
Fix local save on Android
Oct 7, 2024
b283b63
Add nativetrees package
andybak Oct 9, 2024
69d661f
Fix controller positions on Quest
Oct 10, 2024
df2cfd6
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Oct 10, 2024
1dadbfc
Windows to DX not Vulkan
andybak Oct 11, 2024
1f81609
Use Unity json.net
andybak Oct 11, 2024
97be70f
dotnet-format
andybak Oct 11, 2024
faf776b
Uncheck "Meta Quest Support" in XR plugin
andybak Oct 11, 2024
4d7bb39
Fix warning about hidden inherited member
andybak Oct 11, 2024
c50fea7
Don't use persistentDataPath on Android
andybak Oct 11, 2024
81d0a2c
Work in progress UI for tool settings
andybak Oct 11, 2024
006513b
Merge remote-tracking branch 'origin/main' into feature/shape-paramet…
andybak Oct 12, 2024
3d1f37b
Merge branch 'feature/openxr-support' into feature/shape-parameter-ui
andybak Oct 12, 2024
06fd0d6
Re-enable android keystore
mikeage Oct 12, 2024
dc437a7
Merge branch 'feature/openxr-support' into feature/shape-parameter-ui
andybak Oct 15, 2024
209081f
Work in progress UI for tool options panels
andybak Oct 15, 2024
47c529f
White variant of "more" icon
andybak Oct 16, 2024
c387549
Work in progress
andybak Oct 16, 2024
cf73b01
initial button state fix
andybak Oct 16, 2024
8a20cfa
Fix save permissions on Android
Oct 18, 2024
a2f14c5
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Oct 18, 2024
74f2222
Fix logo lighting
Oct 18, 2024
e68ee1a
Fix overlapping text/gifs in tutorial
Oct 19, 2024
b5b120b
Tiny text fix
Oct 19, 2024
1b62b79
Logo remesh
Oct 19, 2024
23c1ba9
Fix compilation error when UNITY_ANDROID is falsey
andybak Oct 22, 2024
59b853b
Add a light specifically for the logo meshes
andybak Oct 22, 2024
f1e7b6d
Tweak logo lighting
andybak Oct 24, 2024
0d35c55
Update Rider package
andybak Oct 24, 2024
7097bd9
Try a basic haptics implementation
andybak Oct 24, 2024
c9d4cdc
GetVelocity (untested)
andybak Oct 24, 2024
595fc79
Add MenuButton mapping for left hand
andybak Oct 24, 2024
84c8586
Revert "Add MenuButton mapping for left hand"
andybak Oct 24, 2024
6f669cd
Fix button mappings (ApplicationMenu is really PrimaryButton for Quest)
andybak Oct 24, 2024
8031485
Use a copy of the Actions prefab without the more button (for now)
andybak Oct 24, 2024
07b2108
Convert microseconds to seconds
andybak Oct 25, 2024
566124d
Prefab-ify input widgets. More progress on slider functionality
andybak Oct 27, 2024
8272cdd
Working slider and some tidy ups
andybak Oct 27, 2024
9cd23cc
Fix shader error
Nov 14, 2024
bd49e66
Put model serialisation in background when saving (no gltf)
Nov 14, 2024
caf6b51
Add meta-required lines to android manifest
andybak Nov 17, 2024
1f25f49
Logo closer to player
Nov 18, 2024
5912ba7
add android:screenOrientation="landscape"
andybak Nov 18, 2024
287c957
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Nov 18, 2024
166a136
Set a couple of player settings to match Open Brush
andybak Nov 18, 2024
a9624f3
Publish Q2
mikeage Nov 16, 2024
7cf69d2
TEMP [revert before merge]: allow pushing of lower numbered versions …
mikeage Nov 16, 2024
d912956
TEMP: disable symbols.zip upload (not currently being generated)
mikeage Nov 16, 2024
e54f5c3
TEMP [revert before merging]: remove release notes
mikeage Nov 16, 2024
a1d2bb8
Merge pull request #60 from icosa-foundation/feature/openxr-upload
mikeage Nov 18, 2024
410b275
Revert logo change
Nov 18, 2024
751b1ab
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Nov 18, 2024
76fb4e3
Logo improvements
Nov 19, 2024
a16816a
remove some permissions that meta is flagging
andybak Nov 19, 2024
a997818
TEMP [revert before merge]: push builds from PR 37
mikeage Nov 19, 2024
c9f0dc6
TEMP [revert before merge]: push builds from PR 37 pt 2
mikeage Nov 19, 2024
45b24e3
Add Logo and Background tags
Dec 2, 2024
97dd82b
Apply the new added cameras to the prefab
andybak Dec 3, 2024
dd7a4eb
Apply the camera setting changes to the prefab
andybak Dec 3, 2024
385d9e1
Updated main scene after prefab changes
andybak Dec 3, 2024
46f2252
Fix bug in MeshCycler
Dec 9, 2024
c70231c
Use MeshCycler in MeshDeleteSyle
Dec 9, 2024
8cefa8e
Do not use "#" in build names
andybak Dec 14, 2024
f752474
Destroy MeshCycler meshes when opening new model
Dec 16, 2024
5d17be0
Destroy meshes in Remesher on Clear
Dec 16, 2024
02f6983
Destroy meshes before remeshing
Dec 16, 2024
716dd0b
Destroy meshes when destroying MeshWithMaterialRenderer
Dec 16, 2024
e569c52
Add memory usage info to palette
Dec 16, 2024
f0f8e73
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
Dec 16, 2024
2067f40
Replicate the fix from open brush pr #799
andybak Dec 17, 2024
908fa44
Merge branch 'main' into feature/openxr-support
mikeage Dec 17, 2024
b86aedd
Revert "Add memory usage info to palette"
andybak Dec 17, 2024
c7a10a5
Merge branch 'feature/openxr-support' of https://github.com/icosa-fou…
andybak Dec 17, 2024
5ba7486
Merge branch 'main' into feature/openxr-support
andybak Dec 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 26 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on: # yamllint disable-line rule:truthy
- "v*"

env:
UNITY_VERSION: "2019.4.25f1"
UNITY_VERSION: "2022.3.42f1"
jobs:
configuration:
if: |
Expand Down Expand Up @@ -176,39 +176,46 @@ jobs:
fail-fast: false
matrix:
flavors: ${{ fromJson(needs.configuration.outputs.flavors) }}
name: [Windows] # These will all be overwritten, but because we have the flavors matrix as well, we can't just add configurations via include; they'll overwrite each other. This way ensures that we get each one
name: [Windows, Oculus Quest (2+)] # These will all be overwritten, but because we have the flavors matrix as well, we can't just add configurations via include; they'll overwrite each other. This way ensures that we get each one
include:
- name: Windows
targetPlatform: StandaloneWindows64
cache: Windows

- name: Oculus Quest (2+)
targetPlatform: Android
vrsdk: Oculus
cache: Android_Vulkan
extraoptions: -btb-il2cpp
versionSuffix: 1
extra_defines: OCULUS_SUPPORTED

steps:
- name: Set masking
run: echo "::add-mask::DoNotStealThis1"
- name: Free extra space
# This takes several minutes, so we only do it where required. As of 12/10/2023, this increases free space from 18GB to 41GB
if: false
# if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneWindows64' || matrix.targetPlatform == 'StandaloneLinux64'
# As of 02/08/2024, this increases free space from 21GB to 47GB
if: matrix.targetPlatform == 'Android'
run: |
echo "Initial free space"
df -h /
echo "Removing all pre-loaded docker images"
docker rmi $(docker image ls -aq) # Removes ~6GB
docker rmi $(docker image ls -aq) # Removes ~3GB
df -h /
echo "Listing 100 largest packages"
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -rn | head -n 100
echo "Removing unneeded large packages"
sudo apt update
sudo apt remove -y '^ghc-.*' '^dotnet-.*' azure-cli powershell google-chrome-stable firefox microsoft-edge-stable 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless # Removes ~7GB # Adding 'google-cloud-*' removes another 750MB but takes about a minute; not worth it
sudo apt remove -y '^ghc-.*' '^dotnet-.*' azure-cli powershell google-chrome-stable firefox microsoft-edge-stable 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless mono-devel libgl1-mesa-dri # Removes ~6GB
sudo apt autoremove -y
sudo apt clean
df -h /
echo "Listing 100 largest remaining packages"
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -rn | head -n 100
echo "Removing remaining large directories"
echo "Removing Android"
sudo rm -rf /usr/local/lib/android # Removes ~9GB
df -h /
echo "Removing remaining large directories"
rm -rf /usr/share/dotnet/ # Removes ~1GB
rm -rf "$AGENT_TOOLSDIRECTORY" # Removes ~6GB
rm -rf "$AGENT_TOOLSDIRECTORY" # Removes ~7GB
echo "Disk space after cleanup"
df -h /

Expand Down Expand Up @@ -288,7 +295,7 @@ jobs:
elif [[ "${{ matrix.targetPlatform}}" == "StandaloneOSX" ]]; then
echo "filename=$BASENAME.app" >> $GITHUB_ENV
elif [[ "${{ matrix.targetPlatform}}" == "Android" ]]; then
echo "filename=com.Icosa.$BASENAME.apk" >> $GITHUB_ENV
echo "filename=foundation.Icosa.$BASENAME.apk" >> $GITHUB_ENV
fi

- name: Enable Development Mode
Expand Down Expand Up @@ -463,15 +470,22 @@ jobs:
with:
name: Windows
path: build_windows
- name: Download Build Artifacts (Oculus Quest 2+)
uses: actions/download-artifact@v4
with:
name: Oculus Quest (2+)
path: build_oculus_quest

- name: Package Artifacts for release
env:
VERSION: ${{ needs.configuration.outputs.version }}
run: |
mkdir releases
mv build_windows/StandaloneWindows64/ releases/OpenBlocks_Desktop_$VERSION/
mv build_oculus_quest/*/foundation.Icosa.OpenBLocks*apk releases/OpenBlocks_Quest_$VERSION.apk
cd releases
zip -r OpenBlocks_Desktop_$VERSION.zip OpenBlocks_Desktop_$VERSION/
rm -rf OpenBlocks_Desktop_$VERSION

- name: Publish
uses: softprops/action-gh-release@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@
/Requests

/Assets/TextMesh Pro*
/UserSettings
13 changes: 10 additions & 3 deletions Assets/Environment/Desert/MI_BarrenSky.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MI_BarrenSky
m_Shader: {fileID: 4800000, guid: c5f37c23ea6cce647af18762f495c67f, type: 3}
m_ShaderKeywords: _EMISSION
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand All @@ -27,6 +32,7 @@ Material:
m_Texture: {fileID: 2800000, guid: 8c5bf1fde457c844e943a6997d3616ff, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CloudStrength: 0.273
- _HorizonStrength: 1
Expand All @@ -38,4 +44,5 @@ Material:
m_Colors:
- _HorizonColor: {r: 0.066176444, g: 0.5468207, b: 1, a: 1}
- _SkyColor: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 0.08627451, g: 0.09019608, b: 0.12941177, a: 1}
m_BuildTextureStacks: []
4 changes: 2 additions & 2 deletions Assets/Environment/Desert/M_BarrenSky.shader
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'

// Shader created with Shader Forge v1.34
// Shader created with Shader Forge v1.34
// Shader Forge (c) Neat Corporation / Joachim Holmer - http://www.acegikmo.com/shaderforge/
// Note: Manually altering this data may prevent you from opening it in Shader Forge
/*SF_DATA;ver:1.34;sub:START;pass:START;ps:flbk:,iptp:2,cusa:False,bamd:0,lico:0,lgpr:1,limd:0,spmd:1,trmd:0,grmd:0,uamb:True,mssp:True,bkdf:False,hqlp:False,rprd:False,enco:False,rmgx:True,rpth:0,vtps:0,hqsc:True,nrmq:1,nrsp:0,vomd:0,spxs:False,tesm:0,olmd:1,culm:0,bsrc:0,bdst:1,dpts:2,wrdp:True,dith:0,atcv:False,rfrpo:True,rfrpn:Refraction,coma:15,ufog:False,aust:False,igpj:True,qofs:0,qpre:0,rntp:1,fgom:False,fgoc:False,fgod:False,fgor:False,fgmd:0,fgcr:1,fgcg:0.8431373,fgcb:0.7294118,fgca:1,fgde:0.017,fgrn:0,fgrf:300,stcl:False,stva:128,stmr:255,stmw:255,stcp:6,stps:0,stfa:0,stfz:0,ofsf:0,ofsu:0,f2p0:False,fnsp:True,fnfb:True;n:type:ShaderForge.SFN_Final,id:3554,x:32480,y:32959,varname:node_3554,prsc:2|emission-8792-OUT;n:type:ShaderForge.SFN_Color,id:8306,x:31088,y:32017,ptovrint:False,ptlb:Sky Color,ptin:_SkyColor,varname:node_8306,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,c1:0.02553246,c2:0.03709318,c3:0.1827586,c4:1;n:type:ShaderForge.SFN_ViewVector,id:2265,x:30477,y:32203,varname:node_2265,prsc:2;n:type:ShaderForge.SFN_Dot,id:7606,x:30734,y:32284,varname:node_7606,prsc:2,dt:1|A-2265-OUT,B-3211-OUT;n:type:ShaderForge.SFN_Vector3,id:3211,x:30477,y:32328,varname:node_3211,prsc:2,v1:0,v2:-1,v3:0;n:type:ShaderForge.SFN_Color,id:3839,x:31088,y:32179,ptovrint:False,ptlb:Horizon Color,ptin:_HorizonColor,varname:_GroundColor_copy,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,c1:0.06617647,c2:0.5468207,c3:1,c4:1;n:type:ShaderForge.SFN_Power,id:4050,x:31088,y:32326,varname:node_4050,prsc:2|VAL-6125-OUT,EXP-7609-OUT;n:type:ShaderForge.SFN_Vector1,id:7609,x:30903,y:32426,varname:node_7609,prsc:2,v1:8;n:type:ShaderForge.SFN_OneMinus,id:6125,x:30903,y:32284,varname:node_6125,prsc:2|IN-7606-OUT;n:type:ShaderForge.SFN_Lerp,id:2737,x:31315,y:32200,cmnt:Sky,varname:node_2737,prsc:2|A-8306-RGB,B-3839-RGB,T-4050-OUT;n:type:ShaderForge.SFN_LightVector,id:3559,x:30039,y:32371,cmnt:Auto-adapts to your directional light,varname:node_3559,prsc:2;n:type:ShaderForge.SFN_Dot,id:1472,x:30398,y:32481,cmnt:Linear falloff to sun angle,varname:node_1472,prsc:2,dt:1|A-8269-OUT,B-8750-OUT;n:type:ShaderForge.SFN_ViewVector,id:8750,x:30211,y:32491,varname:node_8750,prsc:2;n:type:ShaderForge.SFN_Add,id:7568,x:31578,y:32390,cmnt:Sky plus Sun,varname:node_7568,prsc:2|A-2737-OUT,B-5855-OUT;n:type:ShaderForge.SFN_Negate,id:8269,x:30211,y:32371,varname:node_8269,prsc:2|IN-3559-OUT;n:type:ShaderForge.SFN_RemapRangeAdvanced,id:3001,x:30699,y:32613,cmnt:Modify radius of falloff,varname:node_3001,prsc:2|IN-1472-OUT,IMIN-1476-OUT,IMAX-1574-OUT,OMIN-9430-OUT,OMAX-6262-OUT;n:type:ShaderForge.SFN_Slider,id:2435,x:29636,y:32797,ptovrint:False,ptlb:Sun Radius B,ptin:_SunRadiusB,varname:node_2435,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,min:0,cur:0.1,max:0.1;n:type:ShaderForge.SFN_Slider,id:3144,x:29636,y:32691,ptovrint:False,ptlb:Sun Radius A,ptin:_SunRadiusA,varname:_SunOuterRadius_copy,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,min:0,cur:0,max:0.1;n:type:ShaderForge.SFN_Vector1,id:9430,x:30398,y:32941,varname:node_9430,prsc:2,v1:1;n:type:ShaderForge.SFN_Vector1,id:6262,x:30398,y:32999,varname:node_6262,prsc:2,v1:0;n:type:ShaderForge.SFN_Clamp01,id:7022,x:30872,y:32613,varname:node_7022,prsc:2|IN-3001-OUT;n:type:ShaderForge.SFN_OneMinus,id:1574,x:30398,y:32795,varname:node_1574,prsc:2|IN-8889-OUT;n:type:ShaderForge.SFN_OneMinus,id:1476,x:30398,y:32646,varname:node_1476,prsc:2|IN-3432-OUT;n:type:ShaderForge.SFN_Multiply,id:8889,x:30209,y:32795,varname:node_8889,prsc:2|A-9367-OUT,B-9367-OUT;n:type:ShaderForge.SFN_Multiply,id:3432,x:30209,y:32646,varname:node_3432,prsc:2|A-7933-OUT,B-7933-OUT;n:type:ShaderForge.SFN_Max,id:9367,x:29997,y:32795,varname:node_9367,prsc:2|A-3144-OUT,B-2435-OUT;n:type:ShaderForge.SFN_Min,id:7933,x:29997,y:32646,varname:node_7933,prsc:2|A-3144-OUT,B-2435-OUT;n:type:ShaderForge.SFN_Power,id:754,x:31088,y:32667,varname:node_754,prsc:2|VAL-7022-OUT,EXP-5929-OUT;n:type:ShaderForge.SFN_Vector1,id:5929,x:30872,y:32743,varname:node_5929,prsc:2,v1:5;n:type:ShaderForge.SFN_Multiply,id:5855,x:31273,y:32588,cmnt:Sun,varname:node_5855,prsc:2|A-2359-RGB,B-754-OUT,C-7055-OUT;n:type:ShaderForge.SFN_ValueProperty,id:7055,x:31088,y:32815,ptovrint:False,ptlb:Sun Intensity,ptin:_SunIntensity,varname:node_7055,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,v1:2;n:type:ShaderForge.SFN_LightColor,id:2359,x:31088,y:32541,cmnt:Get color from directional light,varname:node_2359,prsc:2;n:type:ShaderForge.SFN_Tex2d,id:9821,x:31323,y:33962,ptovrint:False,ptlb:Sky,ptin:_Sky,varname:node_9821,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,tex:4ed4aeae7237d674f9084d2fce4e5a28,ntxv:0,isnm:False|UVIN-4059-UVOUT;n:type:ShaderForge.SFN_Panner,id:4059,x:31137,y:33984,varname:node_4059,prsc:2,spu:0.03,spv:0|UVIN-6304-UVOUT,DIST-9664-TSL;n:type:ShaderForge.SFN_Time,id:9664,x:30890,y:34061,varname:node_9664,prsc:2;n:type:ShaderForge.SFN_TexCoord,id:6304,x:30890,y:33888,varname:node_6304,prsc:2,uv:0,uaff:False;n:type:ShaderForge.SFN_TexCoord,id:8462,x:29548,y:30866,varname:node_8462,prsc:2,uv:1,uaff:False;n:type:ShaderForge.SFN_Panner,id:9738,x:29880,y:30940,varname:node_9738,prsc:2,spu:-0.1,spv:0|UVIN-8462-UVOUT,DIST-595-TSL;n:type:ShaderForge.SFN_Time,id:595,x:29537,y:31032,varname:node_595,prsc:2;n:type:ShaderForge.SFN_Tex2d,id:3652,x:30084,y:30940,ptovrint:False,ptlb:Clouds,ptin:_Clouds,varname:_FogPattern_copy,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,tex:c1178dfbbc5ee1f4b82d214652566d2b,ntxv:1,isnm:False|UVIN-9738-UVOUT;n:type:ShaderForge.SFN_TexCoord,id:2690,x:29612,y:30930,varname:node_2690,prsc:2,uv:1,uaff:False;n:type:ShaderForge.SFN_Panner,id:1591,x:29944,y:31004,varname:node_1591,prsc:2,spu:-0.1,spv:0|UVIN-2690-UVOUT,DIST-7540-TSL;n:type:ShaderForge.SFN_Time,id:7540,x:29601,y:31096,varname:node_7540,prsc:2;n:type:ShaderForge.SFN_Tex2d,id:2643,x:30148,y:31004,ptovrint:False,ptlb:Clouds_copy,ptin:_Clouds_copy,varname:_Clouds_copy,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,tex:c1178dfbbc5ee1f4b82d214652566d2b,ntxv:1,isnm:False|UVIN-1591-UVOUT;n:type:ShaderForge.SFN_Tex2d,id:2521,x:31152,y:33343,ptovrint:False,ptlb:Clouds,ptin:_Clouds,varname:_Sky_copy,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,tex:c1178dfbbc5ee1f4b82d214652566d2b,ntxv:0,isnm:False|UVIN-6173-UVOUT;n:type:ShaderForge.SFN_Lerp,id:8792,x:31850,y:33559,varname:node_8792,prsc:2|A-9821-RGB,B-2521-RGB,T-522-OUT;n:type:ShaderForge.SFN_Panner,id:6173,x:30886,y:33342,varname:node_6173,prsc:2,spu:0.05,spv:0|UVIN-4322-UVOUT,DIST-7274-TSL;n:type:ShaderForge.SFN_Time,id:7274,x:30636,y:33399,varname:node_7274,prsc:2;n:type:ShaderForge.SFN_TexCoord,id:4322,x:30636,y:33237,varname:node_4322,prsc:2,uv:1,uaff:False;n:type:ShaderForge.SFN_Vector3,id:673,x:31325,y:33074,varname:node_673,prsc:2,v1:0.2352941,v2:0.3333333,v3:0.2352941;n:type:ShaderForge.SFN_Multiply,id:522,x:31396,y:33529,varname:node_522,prsc:2|A-2521-A,B-5298-OUT;n:type:ShaderForge.SFN_Slider,id:5298,x:30995,y:33607,ptovrint:False,ptlb:CloudStrength,ptin:_CloudStrength,varname:node_5298,prsc:2,glob:False,taghide:False,taghdr:False,tagprd:False,tagnsco:False,tagnrm:False,min:0,cur:0,max:1;proporder:8306-3839-2435-3144-7055-9821-2521-5298;pass:END;sub:END;*/
Expand Down Expand Up @@ -46,14 +46,14 @@ Shader "VoidWorld/BarrenSky" {
"LightMode"="ForwardBase"
}

ZWrite Off

CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#define UNITY_PASS_FORWARDBASE
#include "UnityCG.cginc"
#pragma multi_compile_fwdbase
#pragma only_renderers d3d9 d3d11 glcore gles
#pragma target 3.0
uniform float4 _TimeEditor;
uniform float4 _SkyColor;
Expand Down
10 changes: 8 additions & 2 deletions Assets/Models/Logo Materials/Cyan.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Cyan
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -55,6 +59,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand Down Expand Up @@ -82,3 +87,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
10 changes: 8 additions & 2 deletions Assets/Models/Logo Materials/Magenta.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Magenta
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -55,6 +59,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand Down Expand Up @@ -82,3 +87,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
18 changes: 13 additions & 5 deletions Assets/Models/Logo Materials/Orange.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,26 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Orange
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 0
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -55,6 +61,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -63,7 +70,7 @@ Material:
- _EmissiveAmount: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _GlossyReflections: 0
- _Metallic: 0
- _Mirror: 0.1
- _Mode: 0
Expand All @@ -73,7 +80,7 @@ Material:
- _RefractiveIndex: 1.3
- _Roughness: 0.4
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SpecularHighlights: 0
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
Expand All @@ -82,3 +89,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
14 changes: 11 additions & 3 deletions Assets/Models/Logo Materials/Red.mat
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,26 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Red
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 0
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -55,6 +61,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand Down Expand Up @@ -82,3 +89,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
Loading
Loading