Add ThemeColor controller #181

DomNomNom · 2022-05-11T09:46:19Z

Re-purposes the bottom of the controller to show current theme colors

Adds a selection for themecolor mode and displays current theme color:

Adds a controller to change the custom theme colors

pema99 · 2022-05-11T09:51:19Z

This PR shouldn't be against master, please retarget to dev. More pressingly, it sort of looks like you based your branch of an old version of master? The diff is huge has conflicts with dev.

DomNomNom · 2022-05-11T10:27:34Z

Fixed the base / conflicts

pema99 · 2022-05-14T08:23:01Z

AudioLink/Scripts/AudioLinkController.cs

@@ -64,7 +67,21 @@ void Update()

 void Start()
 {
- if (audioLink == null) Debug.Log("Controller not connected to AudioLink");
+ if (audioLink == null) {


I won't block the PR because of it, but again, nice to keep the bracing style consistent.

Fixed. I'm too used to having a linter auto-fix my formatting ^^

pema99 · 2022-05-14T08:24:26Z

AudioLink/Scripts/AudioLinkController.cs

+ if (themeColorController == null) {
+ // This is here in case someone upgraded AudioLink, which updates
+ // everything in the prefab, but not the outermost properties of the prefab.
+ // TODO: Double check that this is how upgrading ends up working.


Did you verify this yourself yet, or shall I do it?

I have not yet verified this. I'd appreciate it if you have time

pema99 · 2022-05-14T08:26:32Z

AudioLink/Scripts/AudioLinkController.cs

+ // TODO: Double check that this is how upgrading ends up working.
+ Debug.Log("AudioLinkController using fallback method for finding themeColorController");
+ Transform controllerTransform = transform.Find("ThemeColorController");
+ themeColorController = (UdonBehaviour) controllerTransform.GetComponent(typeof(UdonBehaviour));


This looks like a nullref exception waiting to happen in case "ThemeColorController" couldn't be found, or if it doesn't have an UdonBehaviour component. Perhaps add some null checks?

Done. Added null-checks.

pema99 · 2022-05-14T08:27:45Z

AudioLink/Scripts/AudioLinkController.cs

- audioSpectrumDisplay.SetFloat("_Threshold0", threshold0Slider.value);
- audioSpectrumDisplay.SetFloat("_Threshold1", threshold1Slider.value);
- audioSpectrumDisplay.SetFloat("_Threshold2", threshold2Slider.value);
- audioSpectrumDisplay.SetFloat("_Threshold3", threshold3Slider.value);


I don't mind at all, but I'm just curious. Why'd you move this?

because it does not depend on audioLink, which is now gated behind a null-check

pema99 · 2022-05-14T08:29:37Z

AudioLink/Scripts/ThemeColorController.cs

+ {
+ [UdonSynced] private int themeColorMode;
+
+ [UdonSynced] public Color[] customThemeColors = new Color[4]{


Wait, you can sync this? I wasn't aware o.o

:D
From Udon docs:

You can sync variables which are arrays for the following types:
bool, char, byte, sbyte, short, ushort, int, uint, long, ulong, float, double, Vector2, Vector3, Vector4, Quaternion, Color and Color32.

pema99 · 2022-05-14T08:36:49Z

This looks great. Thanks for doing it, the theme colors are feeling like a real feature now. I've added a few minor comments.

About the networking code added to support the customizable theme colors, have you tested it? In my experience it can be quite tricky to get Udon networking code right, so I'd like to know if you'v verified it with multiple VRC clients.

pema99 · 2022-05-14T12:38:37Z

Seems like the upgrade logic works fine

* Fix broken shader includes * Add player validity check * Fix NaN propagation through slider control if duration comes back 0 * #if guarded using directives ,class declarations and code that depends vrc/udon to allow compiling without without VRCSDK and UDON * stop unity from throwing warnings * fix implicit truncation warning * recompiled UDON assets and updated prefabs * fixed truncation properly * added override keyword instead of disabling the warning * Recompiled Udon Assets * unified inconsistent line endings * Recompiled Udon Assets * Add editor define to export script * No-op incompatible code * Add render texture property to be set globally * Mode spectrum wheel model. Recompile prefabs * Copy over changelog. Move version included in releases * Add header guard to AudioLink.cginc This is a public facing API, and as such should have a header guard, so that modular shaders can include the file wherever necessary without stepping on each other's toes. As a practical example, adding AudioLink support to LTCGI usually breaks shaders when both are used in combination on one material, since `LTCGI.cginc` also includes `AudioLink.cginc`. * Fixed vertical uv flip of audio texture on Quest * Remove profiler from example scene, fixes #162 * Update instance owner use to the non-broken one. Switch from Networking.IsInstanceOwner to Networking.LocalPlayer.isInstanceOwner because the static method is known to be broken. * Revisited issue #162 Fixed a NullReferenceException that would occur if you have an empty UdonBehaviour when trying to link all sound reactive objects. * Add Demo 9 for ALPASS_THEME_COLOR * Fix Theme colors not being set. * save scene * save * Add Demo 9 to LiveScene too. * Revert to audiolink material * bracing style * add scripting define symbol * Remove some duplicated stuff and copy it over on build instead * Update changelog tentatively * Namespace mirror toggle script to prevent conflicts, recompile assets * cleanup warning * Update some audiolink note functions * revert truncation changes * fixed typos * ThemeColorEnable -> ThemeColorMode (#172) * ThemeColorsEnable -> ThemeColorMode * Use suggested labels for themeColorMode * Remove debug log * themeColorX -> customThemeColorX * update asset file with the addition of "custom" * Move some scripts, namespace editor scripts, recompile needed assets * Change fade defaults to be more responsive. (#176) * Add UTC (Unix Epoc Indexed) Timestamps (#174) * AudioLinkGetTimeOfDay * Update changelog again * Update readme * Little mistake regarding UTC time * Remove unused shader variable. (#177) * Adjust null checks for the audioSource (#180) This prevents AudioLink script from crashing when an audioSource is not present, as it might only be assigned during runtime instead of in editor. Add a warning to notify users about the missing audioSource in case it was unintentional. * fix pixelated logo on controller (#179) * Cleanup repeated uint encoding code. (#178) * Add ThemeColor controller (#181) * ThemeColorsEnable -> ThemeColorMode * Use suggested labels for themeColorMode * Remove debug log * themeColorX -> customThemeColorX * update asset file with the addition of "custom" * Add to Colors to AudioLinkController. * Add Theme color preview to bottom of controller * In progress towards ThemeColorController * Make dropdown work * yay * Fix clipping on selection markers. * brace style * sprinkle in null checks for themeColorController * use casting, not `as` * commit whatever unity did to the asset file * tweak selection indicator positions * Styling * Update readme and changelog * This is 0.2.8 * UI scooting and call things lassos * Hopefully last recompilation * Don't use material from example folder for controller Co-authored-by: Justin Aquadro <[email protected]> Co-authored-by: Float3 <[email protected]> Co-authored-by: yewnyx <[email protected]> Co-authored-by: pi <[email protected]> Co-authored-by: Shadowriver <[email protected]> Co-authored-by: Techanon <[email protected]> Co-authored-by: Nestorboy <[email protected]> Co-authored-by: DomNomNom <[email protected]> Co-authored-by: CNLohr <[email protected]> Co-authored-by: Leah <[email protected]>

DomNomNom added 10 commits April 30, 2022 09:25

ThemeColorsEnable -> ThemeColorMode

bb5b274

Use suggested labels for themeColorMode

e9b9e66

Remove debug log

ca33401

themeColorX -> customThemeColorX

de7376f

update asset file with the addition of "custom"

4d9f80d

Add to Colors to AudioLinkController.

fa3ac7d

Add Theme color preview to bottom of controller

5ca7695

In progress towards ThemeColorController

61142b1

Make dropdown work

77d9027

yay

e5532b4

DomNomNom changed the base branch from master to dev May 11, 2022 09:51

DomNomNom added 2 commits May 11, 2022 21:52

Fix clipping on selection markers.

089e65e

Merge branch 'dev' into control-theme-colors

b647d9f

pema99 reviewed May 14, 2022

View reviewed changes

DomNomNom added 5 commits May 14, 2022 22:59

brace style

60bff16

sprinkle in null checks for themeColorController

59cef53

use casting, not as

3e4f5ba

commit whatever unity did to the asset file

3ffa2bf

tweak selection indicator positions

0706c8e

pema99 merged commit 5d7c15e into llealloo:dev May 14, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ThemeColor controller #181

Add ThemeColor controller #181

DomNomNom commented May 11, 2022

pema99 commented May 11, 2022

DomNomNom commented May 11, 2022

pema99 May 14, 2022

DomNomNom May 14, 2022

pema99 May 14, 2022

DomNomNom May 14, 2022

pema99 May 14, 2022

DomNomNom May 14, 2022

pema99 May 14, 2022

DomNomNom May 14, 2022

pema99 May 14, 2022

DomNomNom May 14, 2022

pema99 commented May 14, 2022

pema99 commented May 14, 2022

Add ThemeColor controller #181

Add ThemeColor controller #181

Conversation

DomNomNom commented May 11, 2022

pema99 commented May 11, 2022

DomNomNom commented May 11, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pema99 commented May 14, 2022

pema99 commented May 14, 2022