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

Reorganise into UPM structure #3

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
# spurious diffs when Unity overwrites CRLF with LF
*.asset text eol=lf
*.meta text eol=lf
*.unity text eol=lf
*.unity text eol=lf
*.mat text eol=lf
Packages/manifest.json text eol=lf
ProjectSettings/*.txt text eol=lf
24 changes: 23 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,24 @@
*.pyc
*.DS_Store
*.DS_Store

# Standard unity stuff
/Temp/
/Obj/
/Build/
/Library/
/Logs/

# mono debugging files, automatically created by UnityVS
*.dll.mdb
*.dll.mdb.meta

# MonoDevelop and Visual Studio files, automatically created by Unity
/*.csproj
/*.unityproj
/*.user
*.suo
/*.sln
/*.userprefs
/.vs/
.vscode
UserSettings
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "TiltBrushToolkitEditor",
"name": "OpenBrush.Toolkit.Editor",
"rootNamespace": "",
"references": [
"TiltBrushToolkitRuntime"
"GUID:4b324bf907ff662458d963e47ba57240"
],
"includePlatforms": [
"Editor"
Expand All @@ -12,5 +13,6 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
"versionDefines": [],
"noEngineReferences": false
}

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

Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ namespace TiltBrushToolkit {

public class EditorUtils {

#region Tilt Menu
#region Open Brush Menu

[MenuItem("Tilt Brush/Labs/Separate strokes by brush color")]
[MenuItem("Open Brush/Labs/Separate strokes by brush color")]
public static void ExplodeSketchByColor() {
if (!EditorUtility.DisplayDialog ("Different Strokes", "Separate brush strokes of different colors into separate objects? \n* Note: This is an experimental feature!", "OK", "Cancel"))
return;
Expand Down Expand Up @@ -111,7 +111,7 @@ public static void ExplodeSketchByColor() {
EditorUtility.ClearProgressBar();
}

[MenuItem("Tilt Brush/Labs/Separate strokes by brush color", true)]
[MenuItem("Open Brush/Labs/Separate strokes by brush color", true)]
public static bool ExplodeSketchByColorValidate() {
// TODO: validate that selection is a model
foreach (var o in Selection.gameObjects) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@

using Object = UnityEngine.Object;
#if UNITY_2017_1_OR_NEWER
using System;
using System.IO;

using UnityEngine;
using UnityEditor;
using UnityEditor.Experimental.AssetImporters;
using UnityEditor.AssetImporters;

namespace TiltBrushToolkit {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@

using Object = UnityEngine.Object;
#if UNITY_2017_1_OR_NEWER
using System;
using System.IO;

using UnityEngine;
using UnityEditor;
using UnityEditor.Experimental.AssetImporters;
using UnityEditor.AssetImporters;

namespace TiltBrushToolkit {

Expand Down

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

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "TiltBrushToolkitThirdPartyEditor",
"name": "OpenBrush.Toolkit.Editor.ThirdParty",
"rootNamespace": "",
"references": [
"TiltBrushToolkitThirdParty"
"GUID:56ceeb69b3820614298ba3264a0d0180"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
Expand All @@ -12,5 +12,7 @@
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

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

Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ Category {
#pragma multi_compile __ TBT_LINEAR_TARGET

#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "../../../Shaders/Include/Particles.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Particles.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

sampler2D _MainTex;
fixed4 _TintColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Shader "Brush/Special/CelVinyl" {
#pragma fragment frag
#pragma multi_compile __ TBT_LINEAR_TARGET
#pragma multi_compile_fog
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "UnityCG.cginc"
#pragma target 3.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Category {
#pragma target 3.0

#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

float _EmissionGain;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Category {
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

sampler2D _MainTex;
sampler2D _AlphaMask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Shader "Brush/Special/DiamondHull" {
#pragma surface surf StandardSpecular vertex:vert nofog
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "../../../Shaders/Include/Brush.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

sampler2D _MainTex;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Shader "Brush/Disco" {
#pragma surface surf StandardSpecular vertex:vert noshadow
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

struct Input {
float2 uv_MainTex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Category {
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "../../../Shaders/Include/Particles.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Particles.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

sampler2D _MainTex;
fixed4 _TintColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SubShader {
#pragma surface surf Lambert vertex:vert addshadow
#pragma target 3.0
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

fixed4 _Color;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Category {
#pragma multi_compile __ TBT_LINEAR_TARGET

#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

sampler2D _MainTex;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Properties {

CGINCLUDE
#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

struct appdata_t {
float4 vertex : POSITION;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ Category {
#pragma target 3.0

#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "../../../Shaders/Include/Particles.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Particles.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

sampler2D _MainTex;
fixed4 _TintColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Category {
#pragma multi_compile __ TBT_LINEAR_TARGET

#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

sampler2D _MainTex;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Category {
#pragma fragment frag
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

sampler2D _MainTex;
uniform float _Cutoff;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Category {
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "UnityCG.cginc"
#include "../../../Shaders/Include/Brush.cginc"
#include "Assets/ThirdParty/Noise/Shaders/Noise.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Scripts/ThirdParty/Noise/Shaders/Noise.cginc"

sampler2D _MainTex;
fixed4 _TintColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Properties {
#pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

struct Input {
float2 uv_MainTex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Properties {
#pragma surface surf StandardSpecular vertex:vert alphatest:_Cutoff addshadow
#pragma multi_compile __ AUDIO_REACTIVE
#pragma multi_compile __ TBT_LINEAR_TARGET
#include "../../../Shaders/Include/Brush.cginc"
#include "Packages/app.openbrush.toolkit/Runtime/Shaders/Include/Brush.cginc"

struct Input {
float2 uv_MainTex;
Expand Down
Loading