huanld/speckle-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: Lil bit of clean up

Browse Source
This commit is contained in:
David Morgan
2021-05-27 12:29:12 -04:00
parent 5fa0416bf9
commit 799ca6228c
26 changed files with 3441 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -71,3 +71,6 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa/*
.idea/
*.meta
# Unity Plugins
/[Aa]ssets/[Pp]lugins/
Assets/Plugins/RainbowAssets/!Core/Assemblies/RainbowCore.dll
BIN
View File
Binary file not shown.
Assets/Plugins/RainbowAssets/!Core/NOTICES.txt
+6
View File
@@ -0,0 +1,6 @@
This software includes third-party software subject to the associated copyrights, as follows:
Name: Unity-Reorderable-List
Repo: https://github.com/cfoulston/Unity-Reorderable-List
License: MIT (https://github.com/cfoulston/Unity-Reorderable-List/blob/master/LICENSE)
Copyright (c) 2017 Chris Foulston
Assets/Plugins/RainbowAssets/RainbowHierarchy/Assemblies/RainbowHierarchy.dll
BIN
View File
Binary file not shown.
Assets/Plugins/RainbowAssets/RainbowHierarchy/Demo/DemoColors.unity
+1444
View File
File diff suppressed because it is too large Load Diff
Assets/Plugins/RainbowAssets/RainbowHierarchy/Demo/DemoComponents.unity
+1444
View File
File diff suppressed because it is too large Load Diff
Assets/Plugins/RainbowAssets/RainbowHierarchy/QuickStart.pdf
BIN
View File
Binary file not shown.
Assets/Speckle Connector/Dispatcher.cs
+14 -7
View File
@@ -37,6 +37,8 @@ namespace Speckle.ConnectorUnity {
EditorCoroutine m_LoggerCoroutine;
public static bool Ownerless { get; set; }
public static Dispatcher Instance { get; set; }
// public static Dispatcher Instance {
// get {
@@ -86,13 +88,18 @@ namespace Speckle.ConnectorUnity {
public void Enqueue( IEnumerator action )
{
lock ( _executionQueue ) {
#if UNITY_EDITOR
_executionQueue.Enqueue( ( ) => { EditorCoroutineUtility.StartCoroutine( action, this ); } );
#endif
// if ( Application.isPlaying ) {
// Debug.Log( "Calling from Play" );
// _executionQueue.Enqueue( ( ) => { StartCoroutine( action ); } );
// }
if ( Application.isEditor ) {
Debug.Log( "Calling from Editor" );
_executionQueue.Enqueue( ( ) => {
if ( Ownerless )
EditorCoroutineUtility.StartCoroutineOwnerless( action );
else
EditorCoroutineUtility.StartCoroutine( action, this );
} );
} else {
Debug.Log( "Calling from Play" );
_executionQueue.Enqueue( ( ) => { StartCoroutine( action ); } );
}
}
}
Assets/Speckle Connector/Receiver.cs
+2
View File
@@ -95,10 +95,12 @@ namespace Speckle.ConnectorUnity {
try {
Debug.Log( $"Trying for Branch: {BranchName} on Stream: {StreamId} " );
var mainBranch = await Client.BranchGet( StreamId, BranchName, 1 );
if ( !mainBranch.commits.items.Any( ) )
throw new Exception( "This branch has no commits" );
var commit = mainBranch.commits.items[ 0 ];
// TODO send info for what objects are being converted
GetAndConvertObject( commit.referencedObject, commit.id );
}
catch ( Exception e ) {
Assets/Speckle Connector/dmo/Editor/BabyStreamManagerEditor.cs
+8 -79
View File
@@ -1,10 +1,5 @@
using System;
using System.Collections;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Unity.EditorCoroutines.Editor;
using UnityEditor;
using UnityEngine;
@@ -16,37 +11,20 @@ namespace Speckle.ConnectorUnity {
[CanEditMultipleObjects]
public class BabyStreamManagerEditor : Editor {
private int _listValue = 10;
private bool _auto,_foldOutAccount, _foldOutStreams;
private string[ ] _streamNames,_accountNames;
private int _selectedStreamIndex, _selectedBranchIndex, _selectedCommitIndex, _selectedAccountIndex, _selectedServerIndex;
private string[ ] _streamNames;
private int _listValue = 10;
public string[ ] branchNames { private get; set; }
public string[ ] commitIds { private get; set; }
private bool _auto, _processing;
private bool _foldOutAccount, _foldOutStreams;
private string[ ] accountNames;
[InitializeOnLoadMethod]
private static void Initialize( ) => EditorApplication.update += ExecuteContinuations;
private static void Initialize( ) => EditorApplication.update += Ayuda.ExecuteContinuations;
private void OnEnable( )
{
BabyStreamManager script = (BabyStreamManager) target;
accountNames = script.Fetch.Accounts.GetNames( ).ToArray( );
_accountNames = script.Fetch.Accounts.GetNames( ).ToArray( );
script.GetSpeckleAccountData( );
}
// EditorCoroutine m_LoggerCoroutine;
// private IEnumerator LogTimeSinceCall( )
// {
// while ( true ) {
// Debug.Log("Running");
// yield return null;
// }
// }
public override async void OnInspectorGUI( )
{
@@ -55,44 +33,14 @@ namespace Speckle.ConnectorUnity {
BabyStreamManager script = (BabyStreamManager) target;
_processing = script.InProcess;
#region Async Test GUI
// if ( GUILayout.Button( "Do time consuming stuff" ) ) {
// Debug.Log( "before: " + Thread.CurrentThread.ManagedThreadId );
// if ( _processing ) {
// Debug.Log( "In process, block dropped..." );
// } else {
// script.InProcess = true;
// await Task.Run( DoTimeConsumingStuff );
// script.InProcess = false;
//
// Debug.Log( "after: " + Thread.CurrentThread.ManagedThreadId );
// return;
// }
// }
//
// GUILayout.BeginHorizontal( );
//
// if ( GUILayout.Button( "Post" ) ) {
// SynchronizationContext.Current.Post( _ => Debug.Log( "Submitted via Post" ), null );
// }
//
// if ( GUILayout.Button( "Send" ) ) {
// SynchronizationContext.Current.Send( _ => Debug.Log( "Submitted via Send" ), null );
// }
//
// GUILayout.EndHorizontal( );
#endregion
#region Account GUI
EditorGUILayout.BeginHorizontal( );
_selectedAccountIndex = EditorGUILayout.Popup( "Accounts", _selectedAccountIndex, accountNames, GUILayout.ExpandWidth( true ), GUILayout.Height( 20 ) );
_selectedAccountIndex = EditorGUILayout.Popup( "Accounts", _selectedAccountIndex, _accountNames, GUILayout.ExpandWidth( true ), GUILayout.Height( 20 ) );
if ( GUILayout.Button( "Load", GUILayout.Width( 60 ), GUILayout.Height( 20 ) ) || accountNames == null ) {
if ( GUILayout.Button( "Load", GUILayout.Width( 60 ), GUILayout.Height( 20 ) ) || _accountNames == null ) {
await Task.Run( ( ) => script.GetSpeckleAccountData( ) );
accountNames = script.Fetch.Accounts.GetNames( ).ToArray( );
_accountNames = script.Fetch.Accounts.GetNames( ).ToArray( );
return;
}
@@ -135,11 +83,6 @@ namespace Speckle.ConnectorUnity {
#region Stream List
var items = script.Fetch.StreamsByName.ToArray( );
// if ( items.Length <= 0 ) {
// Debug.LogWarning( "No Streams available in this account, please create some streams yo" );
// return;
// }
EditorGUILayout.BeginHorizontal( );
_selectedStreamIndex = EditorGUILayout.Popup( "Streams",
@@ -195,19 +138,5 @@ namespace Speckle.ConnectorUnity {
serializedObject.ApplyModifiedProperties( );
}
private void DoTimeConsumingStuff( )
{
Debug.Log( "doing..." );
Thread.Sleep( 1000 );
Debug.Log( "done: " + Thread.CurrentThread.ManagedThreadId );
}
private static void ExecuteContinuations( )
{
var context = SynchronizationContext.Current;
var execMethod = context.GetType( ).GetMethod( "Exec", BindingFlags.NonPublic | BindingFlags.Instance );
execMethod.Invoke( context, null );
}
}
}
Assets/Speckle Connector/dmo/Editor/DispatcherEditor.cs
+109
View File
@@ -0,0 +1,109 @@
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Speckle.Core.Api;
using Speckle.Core.Credentials;
using UnityEditor;
using UnityEngine;
namespace Speckle.ConnectorUnity.GUI {
public class FunBatch {
public Action<bool> MightHaveWork;
public async void Init( )
{
var speckleAccount = AccountManager.GetAccounts( ).FirstOrDefault( );
if ( speckleAccount == null ) {
Debug.Log( "Please set a default account in SpeckleManager" );
return;
}
var client = new Client( speckleAccount );
var streams = await client.StreamsGet( 10 );
var stream = streams.FirstOrDefault( s => s.name.Equals( "WhiteDoe" ) );
var instance = new GameObject( stream.name ).AddComponent<Receiver>( );
instance.Init( stream.id, false, false, speckleAccount,
onDataReceivedAction: go => { go.transform.SetParent( instance.transform ); },
onTotalChildrenCountKnown: count => { instance.TotalChildrenCount = count; },
onProgressAction: dict => { Dispatcher.Instance.Enqueue( ( ) => { Debug.Log( dict.Values.Average( ) / instance.TotalChildrenCount ); } ); } );
instance.ReceiveCompleteAction += ( ) => {
MightHaveWork?.Invoke( true );
Debug.Log( "Receive Complete" );
};
instance.Receive( "main" );
}
}
[CustomEditor( typeof( Dispatcher ) )]
public class DispatcherEditor : Editor {
[InitializeOnLoadMethod]
private static void Initialize( ) => EditorApplication.update += Ayuda.ExecuteContinuations;
public override async void OnInspectorGUI( )
{
DrawDefaultInspector( );
serializedObject.Update( );
Dispatcher script = (Dispatcher) target;
GUILayout.BeginHorizontal( );
if ( GUILayout.Button( "Owner Batch" ) ) {
Dispatcher.Ownerless = false;
// await Task.Run(script.EnqueueAsync( DoTimeConsumingStuff ) );
Ayuda.SyncCall( _ => script.Enqueue( DoTimeConsumingStuff ) );
}
if ( GUILayout.Button( "Ownerless Batch" ) ) {
Dispatcher.Ownerless = true;
Ayuda.SyncCall( _ => script.Enqueue( DoTimeConsumingStuff ) );
}
GUILayout.EndHorizontal( );
// GUILayout.BeginHorizontal( );
//
// if ( GUILayout.Button( "Async Owner Batch" ) ) {
// if ( !_doingThings ) {
// Dispatcher.Ownerless = false;
// await script.EnqueueAsync( DoTimeConsumingStuff );
// return;
// }
//
// Debug.Log( "Doing Things!" );
// }
//
// if ( GUILayout.Button( "Async Ownerless Batch" ) ) {
// if ( !_doingThings ) {
// Dispatcher.Ownerless = true;
// await script.EnqueueAsync( DoTimeConsumingStuff );
// return;
// }
//
// Debug.Log( "Doing Things!" );
// }
//
// GUILayout.EndHorizontal( );
serializedObject.ApplyModifiedProperties( );
}
private void DoTimeConsumingStuff( )
{
Debug.Log( "doing..." );
Thread.Sleep( 200 );
Debug.Log( "done: " + Thread.CurrentThread.ManagedThreadId );
// force refresh
Repaint( );
}
}
}
Assets/Speckle Connector/dmo/things/BasicBabyStreamSpace.unity → Assets/Speckle Connector/dmo/dScenes/TestSpace_BabyStreamManger.unity
View File
Assets/Speckle Connector/dmo/dScenes/TestSpace_Dispatcher.unity
+400
View File
@@ -0,0 +1,400 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &323147531
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 323147534}
- component: {fileID: 323147533}
- component: {fileID: 323147532}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &323147532
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 323147531}
m_Enabled: 1
--- !u!20 &323147533
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 323147531}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &323147534
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 323147531}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &458225217
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 458225219}
- component: {fileID: 458225218}
m_Layer: 0
m_Name: RainbowHierarchyRuleset
m_TagString: EditorOnly
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &458225218
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458225217}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 366663908, guid: ebe26e22332665d4c8332b2a624e5e8b, type: 3}
m_Name:
m_EditorClassIdentifier:
Rules:
- Type: 0
Name:
GameObject: {fileID: 1987772512}
Ordinal: 0
Priority: 0
IconType: 2740
IconTexture: {fileID: 0}
IsIconRecursive: 0
BackgroundType: 100
BackgroundTexture: {fileID: 0}
IsBackgroundRecursive: 0
IsHidden: 0
--- !u!4 &458225219
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458225217}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1013213356
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1013213358}
- component: {fileID: 1013213357}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1013213357
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013213356}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1013213358
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013213356}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1987772512
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1987772514}
- component: {fileID: 1987772515}
m_Layer: 0
m_Name: FunBatcher
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1987772514
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1987772512}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1987772515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1987772512}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 446eb2de03584f959b5aaf9427734028, type: 3}
m_Name:
m_EditorClassIdentifier:
Assets/Speckle Connector/dmo/Ayuda.cs → Assets/Speckle Connector/dmo/dScripts/Ayuda.cs
+10
View File
@@ -1,5 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading;
using Speckle.Core.Api;
namespace Speckle.ConnectorUnity {
@@ -16,6 +18,14 @@ namespace Speckle.ConnectorUnity {
public static class Ayuda {
public static void SyncCall( SendOrPostCallback post ) => SynchronizationContext.Current.Post( post, null );
public static void ExecuteContinuations( )
{
var context = SynchronizationContext.Current;
var execMethod = context.GetType( ).GetMethod( "Exec", BindingFlags.NonPublic | BindingFlags.Instance );
execMethod.Invoke( context, null );
}
public static List<SpeckleSimpleInfo> GetInfo( this IEnumerable<Stream> input )
{
Assets/Speckle Connector/dmo/BabyBase.cs → Assets/Speckle Connector/dmo/dScripts/BabyBase.cs
View File
Assets/Speckle Connector/dmo/BabyStreamManager.cs → Assets/Speckle Connector/dmo/dScripts/BabyStreamManager.cs
+1 -6
View File
@@ -264,12 +264,7 @@ namespace Speckle.ConnectorUnity {
onTotalChildrenCountKnown: count => { instance.TotalChildrenCount = count; },
onProgressAction: dict => { Dispatcher.Enqueue( ( ) => { Debug.Log( dict.Values.Average( ) / instance.TotalChildrenCount ); } ); } );
instance.ReceiveCompleteAction += ( ) => {
Debug.Log( "Receive Complete" );
// InProcess = false;
};
// InProcess = true;
instance.ReceiveCompleteAction += ( ) => { Debug.Log( "Receive Complete" ); };
instance.Receive( branchName );
Assets/Speckle Connector/dmo/SpeckleUnityEventArgs.cs → Assets/Speckle Connector/dmo/dScripts/SpeckleUnityEventArgs.cs
View File
Assets/Speckle Connector/dmo/GUI/ReadOnlyAttribute.cs → Assets/Speckle Connector/dmo/dScripts/dGUI/ReadOnlyAttribute.cs
View File
Assets/Speckle Connector/dmo/GUI/SpeckleSkin.guiskin → Assets/Speckle Connector/dmo/dScripts/dGUI/SpeckleSkin.guiskin
View File
Assets/Speckle Connector/dmo/GUI/StreamPropertyDrawersHelper.cs → Assets/Speckle Connector/dmo/dScripts/dGUI/StreamPropertyDrawersHelper.cs
View File
Assets/Speckle Connector/dmo/GUI/StringInList.cs → Assets/Speckle Connector/dmo/dScripts/dGUI/StringInList.cs
View File
Assets/Speckle Connector/dmo/GUI/StringInListDrawer.cs → Assets/Speckle Connector/dmo/dScripts/dGUI/StringInListDrawer.cs
View File
Assets/Speckle Connector/dmo/ScriptableObj/AccountSO.cs → Assets/Speckle Connector/dmo/dScripts/dScriptableObj/AccountSO.cs
View File
Assets/Speckle Connector/dmo/ScriptableObj/StreamSO.cs → Assets/Speckle Connector/dmo/dScripts/dScriptableObj/StreamSO.cs
View File
Assets/Speckle Connector/dmo/Streams/SpeckleStream.asset → Assets/Speckle Connector/dmo/dStreams/SpeckleStream.asset
View File
Assets/Speckle Connector/dmo/things/StreamTest.asset
-16
View File
@@ -1,16 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c2110f382384646afeb0ebe0b2109f0, type: 3}
m_Name: StreamTest
m_EditorClassIdentifier:
id: 48977d8ff0
name: TestStudy