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

WebGL #312

Merged
merged 31 commits into from
Aug 1, 2024
Merged

WebGL #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
616011d
Add AudioLink Web Project (without AudioLink hook)
fundale Apr 18, 2024
d829099
AudioLink Web data fetch hook
fundale Apr 18, 2024
2a96283
Minor Tweaks
fundale Apr 18, 2024
679f0a2
Remove debug Quad & unref test Audio
fundale Apr 18, 2024
6d70210
Redo AL's Web Hook, fix some things (focus,stereo)
fundale Apr 19, 2024
488f023
Include refrence in new file :p
fundale Apr 19, 2024
398d1ea
Remove old code, a few more tweaks
fundale Apr 19, 2024
e927e1d
Include project config to satisfy Unity
fundale Apr 19, 2024
33941b9
Editor fix & remove AL camera
fundale Apr 19, 2024
a7c3949
Reset default web project script defines
fundale Apr 20, 2024
7239d25
Merge branch 'llealloo:master' into vrc-udon-audio-link-web-130
fundale Apr 21, 2024
db4350e
Merge branch 'llealloo:master' into vrc-udon-audio-link-web-130
fundale Apr 22, 2024
7102855
configure
float3 Apr 22, 2024
1fd2675
WebGL Demo
float3 Apr 23, 2024
42fb803
Update scene path in EditorBuildSettings.asset
float3 Apr 23, 2024
e3c0556
need to find out why we do this
float3 Apr 23, 2024
0baa04a
Merge branch 'master' into web
float3 May 13, 2024
0f7a691
refactor: Remove unused sliders in AudioLinkController.cs
float3 May 13, 2024
18afc07
chore: Update AudioLinkWebProject manifest.json path
float3 May 13, 2024
526d4dc
chore: Update Unity toolchain dependencies
float3 May 13, 2024
c3549e3
add new helper methods
float3 May 13, 2024
6a15e57
set up the scene
float3 May 13, 2024
29f9cf8
format
float3 May 15, 2024
7701887
fix namespace
float3 May 15, 2024
9843874
Try and Catch on Unlink
fundale May 18, 2024
d023cd4
address some of the comments
float3 Jul 25, 2024
6d9d224
remove tvos
float3 Jul 25, 2024
851bede
adjust gitignores
float3 Jul 29, 2024
9d6ee1b
adress comments
float3 Jul 29, 2024
cb1ca3d
deduplicate gitignore
float3 Jul 29, 2024
27b651a
do straightforward settings/getting
float3 Jul 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ csharp_new_line_between_query_expression_clauses = true
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_case_contents_when_block = false
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

Expand Down Expand Up @@ -92,6 +92,7 @@ dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_collection_expression = when_types_exactly_match
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
Expand Down
80 changes: 0 additions & 80 deletions .gitignore

This file was deleted.

84 changes: 84 additions & 0 deletions AudioLinkSandboxProject/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Generated SerializedProgramAssets
/[Aa]ssets/SerializedUdonPrograms/*.asset*

/.vscode/
/[Aa]ssets/Scenes*
/[Aa]ssets/Samples*
/[Aa]ssets/UdonSharp/
/[Aa]ssets/UdonSharp.meta
/[Aa]ssets/AmplifyShaderEditor/
/[Aa]ssets/AmplifyShaderEditor.meta
/[Aa]ssets/SerilizedUdonPrograms/
11 changes: 10 additions & 1 deletion AudioLinkUnityProject/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,13 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Generated SerializedProgramAssets
/[Aa]ssets/SerializedUdonPrograms/*.asset*
/[Aa]ssets/SerializedUdonPrograms/*.asset*

/.vscode/
/[Aa]ssets/Scenes*
/[Aa]ssets/Samples*
/[Aa]ssets/UdonSharp/
/[Aa]ssets/UdonSharp.meta
/[Aa]ssets/AmplifyShaderEditor/
/[Aa]ssets/AmplifyShaderEditor.meta
/[Aa]ssets/SerilizedUdonPrograms/
1 change: 1 addition & 0 deletions AudioLinkUnityProject/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"com.unity.textmeshpro": "3.0.8",
"com.unity.timeline": "1.7.6",
"com.unity.toolchain.linux-x86_64": "2.0.6",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
16 changes: 13 additions & 3 deletions AudioLinkUnityProject/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
"url": "https://packages.unity.com"
},
"com.unity.sysroot": {
"version": "2.0.7",
"version": "2.0.10",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
"version": "2.0.6",
"version": "2.0.9",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.7"
"com.unity.sysroot": "2.0.10"
},
"url": "https://packages.unity.com"
},
Expand Down Expand Up @@ -103,6 +103,16 @@
},
"url": "https://packages.unity.com"
},
"com.unity.toolchain.win-x86_64-linux-x86_64": {
"version": "2.0.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.10",
"com.unity.sysroot.linux-x86_64": "2.0.9"
},
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
"depth": 0,
Expand Down
84 changes: 84 additions & 0 deletions AudioLinkWebProject/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# This .gitignore file should be placed at the root of your Unity project directory
float3 marked this conversation as resolved.
Show resolved Hide resolved
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Generated SerializedProgramAssets
/[Aa]ssets/SerializedUdonPrograms/*.asset*

/.vscode/
/[Aa]ssets/Scenes*
/[Aa]ssets/Samples*
/[Aa]ssets/UdonSharp/
/[Aa]ssets/UdonSharp.meta
/[Aa]ssets/AmplifyShaderEditor/
/[Aa]ssets/AmplifyShaderEditor.meta
/[Aa]ssets/SerilizedUdonPrograms/
24 changes: 24 additions & 0 deletions AudioLinkWebProject/Assets/FramerateCap.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#if !UDONSHARP
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
#if AUDIOLINK_V1
using AudioLink;
#endif

public class FramerateCap : MonoBehaviour
{
#if AUDIOLINK_V1
public AudioLink.AudioLink audioLink;
#endif
public int limit = 60;

void Start()
{
Application.targetFrameRate = limit;
#if AUDIOLINK_V1
if (audioLink != null) audioLink.audioRenderTexture.updatePeriod = 1 / (float)limit;
#endif
}
}
#endif
11 changes: 11 additions & 0 deletions AudioLinkWebProject/Assets/FramerateCap.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions AudioLinkWebProject/Assets/Media.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading
Loading