UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.20.1

Browse Source
This commit is contained in:
wsh
2025-02-21 11:57:09 +09:00
parent 64352f5f46
commit 912a242bae
112 changed files with 934 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Editor/WI/INIEditor.cs
View File

@@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using UnityEditor;
using UnityEngine;
using WI;
using XRLib;
using XED;
[CustomAsset(".ini")]

4
Assets/Editor/WI/PanelBaseEditor.cs
View File

@@ -2,8 +2,8 @@ using TMPro;
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
[CustomEditor(typeof(PanelBase), true)]
public class PanelBaseEditor : Editor

4
Assets/Editor/WI/TwinObjectPreprocessingHelper.cs
View File

@@ -2,8 +2,8 @@ using UnityEngine;
using UnityEditor;
using System.IO;
using System.Collections.Generic;
using WI;
using WI.Util;
using XRLib;
using XRLib.Util;
using System.Threading.Tasks;
#if UNITY_EDITOR
using UnityEditor.AddressableAssets.Settings;

8
Assets/Image/Icons/StatusIcon.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 525ce526fdb6bc048b5ed4551f2bbcdb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Image/Icons/StatusIcon/IMG_Object.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

117
Assets/Image/Icons/StatusIcon/IMG_Object.png.meta Normal file
View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 2d74373bcf4b23a4a9630a1ace1b2c3c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Image/Icons/StatusIcon/IMG_Property.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

117
Assets/Image/Icons/StatusIcon/IMG_Property.png.meta Normal file
View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 437c557ac72065b4c8f9bcb6fe6450c1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

30
Assets/Panel_ModeControl.cs Normal file
View File

@@ -0,0 +1,30 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace XED.UI
{
public class Panel_ModeControl : PanelBase
{
Button button_ObjectMode;
Button button_PropertyMode;
public Action onClickObjectMode;
public Action onClickPropertyMode;
public override void AfterAwake()
{
button_ObjectMode.onClick.AddListener(OnClickObjectMode);
button_PropertyMode.onClick.AddListener(OnClickPropertyMode);
}
private void OnClickPropertyMode()
{
onClickPropertyMode();
}
private void OnClickObjectMode()
{
onClickObjectMode();
}
}
}

2
Assets/Panel_ModeControl.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 924ac0c6c9fadc24bbb821b72f962fdf

369
Assets/Scenes/0.18.2.unity
View File

@@ -1247,6 +1247,126 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 226990849}
m_CullTransparentMesh: 1
--- !u!1 &228222345
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 228222346}
- component: {fileID: 228222349}
- component: {fileID: 228222348}
- component: {fileID: 228222347}
m_Layer: 5
m_Name: button_PropertyMode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &228222346
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228222345}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1267680410}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &228222347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228222345}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 228222348}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &228222348
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228222345}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 437c557ac72065b4c8f9bcb6fe6450c1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &228222349
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228222345}
m_CullTransparentMesh: 1
--- !u!1 &242218419
GameObject:
m_ObjectHideFlags: 0
@@ -12200,6 +12320,123 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1259139621}
m_CullTransparentMesh: 1
--- !u!1 &1267680409
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1267680410}
- component: {fileID: 1267680412}
- component: {fileID: 1267680411}
- component: {fileID: 1267680413}
- component: {fileID: 1267680414}
m_Layer: 5
m_Name: Panel_ModeControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1267680410
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267680409}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1441967168}
- {fileID: 228222346}
m_Father: {fileID: 1791423234}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 116, y: -118}
m_SizeDelta: {x: 100.5155, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1267680411
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267680409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f03871f0457b28941864ab61d945cf0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1267680412
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267680409}
m_CullTransparentMesh: 1
--- !u!114 &1267680413
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267680409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &1267680414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267680409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 924ac0c6c9fadc24bbb821b72f962fdf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1282805259
PrefabInstance:
m_ObjectHideFlags: 0
@@ -13263,6 +13500,126 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
m_PrefabInstance: {fileID: 1439596646}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1441967167
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1441967168}
- component: {fileID: 1441967171}
- component: {fileID: 1441967170}
- component: {fileID: 1441967169}
m_Layer: 5
m_Name: button_ObjectMode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1441967168
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441967167}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1267680410}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1441967169
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441967167}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1441967170}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1441967170
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441967167}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2d74373bcf4b23a4a9630a1ace1b2c3c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1441967171
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441967167}
m_CullTransparentMesh: 1
--- !u!224 &1452621084 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3}
@@ -16598,7 +16955,7 @@ GameObject:
- component: {fileID: 1791423231}
- component: {fileID: 1791423236}
m_Layer: 5
m_Name: Canvas_Top
m_Name: Canvas_Static
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -16682,6 +17039,7 @@ RectTransform:
- {fileID: 602839464}
- {fileID: 1715748516}
- {fileID: 2476199971772782488}
- {fileID: 1267680410}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -16704,6 +17062,7 @@ MonoBehaviour:
panel_shortcuts: {fileID: 0}
panel_topbar: {fileID: 0}
panel_toolbar: {fileID: 0}
panel_modecontrol: {fileID: 0}
--- !u!4 &1805249248 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
@@ -18520,7 +18879,7 @@ GameObject:
- component: {fileID: 2021424132}
- component: {fileID: 2021424133}
m_Layer: 0
m_Name: StatusPanel
m_Name: ModePanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -18550,10 +18909,10 @@ MonoBehaviour:
m_GameObject: {fileID: 2021424131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d98e10ccfa7c43c44bf480f61f6d124e, type: 3}
m_Script: {fileID: 11500000, guid: ee0d8336379a74f44adbe97ba6c56982, type: 3}
m_Name:
m_EditorClassIdentifier:
currentStatus: 0
currentMode: 0
--- !u!1 &2021949617
GameObject:
m_ObjectHideFlags: 0
@@ -22737,7 +23096,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 15.399902, y: 426}
m_AnchoredPosition: {x: 15.399902, y: 351}
m_SizeDelta: {x: 68, y: 814.72}
m_Pivot: {x: 0, y: 1}
--- !u!224 &2479832392127339957

2
Assets/Scripts/Assets/Gizmo/GizmoController.cs
View File

@@ -2,7 +2,7 @@ using RTG;
using System;
using System.Collections.Generic;
using UnityEngine;
using WI;
using XRLib;
using XED.UI;
namespace XED.RuntimeGizmo

2
Assets/Scripts/Canvas_Component.cs
View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/ConnectionHandlePoint.cs
View File

@@ -3,7 +3,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using WI.UI;
using XRLib.UI;
using XED.UI;
using static DrawLine;

2
Assets/Scripts/XED/AssetTool/CustomAssetConnector.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using UnityEngine;
using XED.UI;
using WI;
using XRLib;
using XED.Manage;
using XED.Util;
using XED.Hierarchy;

2
Assets/Scripts/XED/AssetTool/LocalItem.cs
View File

@@ -3,7 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using UnityEngine;
using WI;
using XRLib;
namespace XED
{

10
Assets/Scripts/XED/AssetTool/RenderObjectHandler.cs
View File

@@ -11,8 +11,10 @@ using XED.RuntimeGizmo;
namespace XED.Util
{
public class RenderObjectHandler : MonoBehaviour, IStatusController, IInputHandler
public class RenderObjectHandler : MonoBehaviour, IModeController, IInputHandler
{
public ModePanel.ProgramMode mode => ModePanel.ProgramMode.ObjectLayout;
List<CustomAssetRenderObject> selectedRenderObjects = new List<CustomAssetRenderObject>();
List<CustomAssetRenderObject> copyRenderObjects = new List<CustomAssetRenderObject>();
List<GameObject> selectedGameObjects = new List<GameObject>();
@@ -307,12 +309,14 @@ namespace XED.Util
}
InputHandler myHandler;
public void CurrentStatusEvent()
public void StatusEnterEvent()
{
FindSingle<UserInputManager>().SetHandler(myHandler);
}
public void PrevStatusEvent()
public void StatusExitEvent()
{
FindSingle<UserInputManager>().RemoveHandler(myHandler);
}

2
Assets/Scripts/XED/Building/FloorCreateManager.cs
View File

@@ -3,7 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using WI;
using XRLib;
using XED.Manage;
using static UnityEngine.Rendering.DebugUI;

2
Assets/Scripts/XED/Building/MeshCreator.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using TriLibCore.Dae.Schema;
using UnityEngine;
using WI;
using XRLib;
namespace XED
{

2
Assets/Scripts/XED/Building/ObjectDistanceLine.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEditor;
using WI;
using XRLib;
using XED.UI;
namespace XED.UI

2
Assets/Scripts/XED/Building/ObjectHandler.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using WI;
using XRLib;
using XED;
public class ObjectHandler : MonoBehaviour, ISingle

2
Assets/Scripts/XED/Building/Wall.cs
View File

@@ -4,7 +4,7 @@ using System.Drawing;
using System.Linq;
using System.Security.Cryptography;
using UnityEngine;
using WI;
using XRLib;
using static XED.WallBuilder;
using Color = UnityEngine.Color;

16
Assets/Scripts/XED/Building/WallBuilder.cs
View File

@@ -5,14 +5,14 @@ using Unity.Burst.CompilerServices;
using UnityEditor;
using UnityEngine;
using UnityEngine.EventSystems;
using WI;
using XRLib;
using XED.Interfaces;
using XED.Manage;
using XED.RuntimeGizmo;
namespace XED
{
public class WallBuilder : MonoBehaviour, ISingle, IInputHandler, IStatusController
public class WallBuilder : MonoBehaviour, ISingle, IInputHandler, IModeController
{
public enum VirtualPoint
{
@@ -111,6 +111,11 @@ namespace XED
break;
}
}
public void DrawWallStart()
{
SetDrawState(BuilderState.Drawing);
}
public void SetDrawState(BuilderState state)
{
drawState = state;
@@ -994,7 +999,7 @@ namespace XED
return result;
}
public void CurrentStatusEvent()
public void StatusEnterEvent()
{
var raycaster = FindSingle<Raycaster>();
raycaster.AddEvent(Raycaster.EventType.FirstStay, typeof (Map), OnStayMap);
@@ -1004,7 +1009,7 @@ namespace XED
FindSingle<UserInputManager>().SetHandler(handler);
}
public void PrevStatusEvent()
public void StatusExitEvent()
{
var raycaster = FindSingle<Raycaster>();
raycaster.RemoveEvent(Raycaster.EventType.FirstStay, typeof(Map), OnStayMap);
@@ -1052,10 +1057,13 @@ namespace XED
clickedPoint = null;
SetDrawState(BuilderState.None);
}
public ModePanel.ProgramMode mode => ModePanel.ProgramMode.WallDrawing;
#if UNITY_EDITOR
public float gizmoTh;
public float gizmosp;
private void OnDrawGizmos()
{
foreach (var wall in walls)

2
Assets/Scripts/XED/Building/WallGroup.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.Pool;
using WI;
using XRLib;
namespace XED
{

2
Assets/Scripts/XED/ComponentSystem/ActionComponentRunner.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using WI;
using XRLib;
namespace XED.ComponentSystem
{

2
Assets/Scripts/XED/ComponentSystem/ComponentViewer.cs
View File

@@ -1,4 +1,4 @@
using WI;
using XRLib;
namespace XED.ComponentSystem
{

10
Assets/Scripts/XED/Interfaces/IModeController.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace XED.Interfaces
{
public interface IModeController
{
Manage.ModePanel.ProgramMode mode { get; }
void StatusEnterEvent();
void StatusExitEvent();
}
}

0
Assets/Scripts/XED/Interfaces/IStatusController.cs.meta → Assets/Scripts/XED/Interfaces/IModeController.cs.meta
View File

8
Assets/Scripts/XED/Interfaces/IStatusController.cs
View File

@@ -1,8 +0,0 @@
namespace XED.Interfaces
{
public interface IStatusController
{
void CurrentStatusEvent();
void PrevStatusEvent();
}
}

2
Assets/Scripts/XED/Machine/AGV/AGVNode/AGVNodeLinkManager.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using UnityEngine;
using WI;
using XRLib;
namespace XED.Machine
{

10
Assets/Scripts/XED/Machine/AGV/AGVNode/AGVNodeManager.cs
View File

@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
using TriLibCore.SFB;
using UnityEngine;
using UnityEngine.EventSystems;
using WI;
using XRLib;
using XED.Interfaces;
using XED.Manage;
@@ -21,7 +21,7 @@ namespace XED.Machine
Select,
Setting
}
public class AGVNodeManager : MonoBehaviour, ISingle, IStatusController, IInputHandler
public class AGVNodeManager : MonoBehaviour, ISingle, IModeController, IInputHandler
{
[SerializeField]
GameObject nodePrefab;
@@ -51,6 +51,8 @@ namespace XED.Machine
InputHandler myHandler;
NodeGizmoController nodeGizmoController;
public ModePanel.ProgramMode mode => ModePanel.ProgramMode.AGVPathDrawing;
public override void AfterStart()
{
agvNodeMap = new AGVNodeMap();
@@ -400,7 +402,7 @@ namespace XED.Machine
onNodeSequenceUpdated?.Invoke(selectedNodeSequence);
}
public void CurrentStatusEvent()
public void StatusEnterEvent()
{
var raycaster = FindSingle<Raycaster>();
FindSingle<UserInputManager>().SetHandler(myHandler);
@@ -409,7 +411,7 @@ namespace XED.Machine
raycaster.AddEvent(Raycaster.EventType.FirstLeftClickOnly, typeof(Map), ONClickGround);
}
public void PrevStatusEvent()
public void StatusExitEvent()
{
var raycaster = FindSingle<Raycaster>();
FindSingle<UserInputManager>().RemoveHandler(myHandler);

2
Assets/Scripts/XED/Machine/AGV/AGVNode/AGVNodeModePopup.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
namespace XED.Machine
{

4
Assets/Scripts/XED/Machine/AGV/AGVNode/AGVNodePopup.cs
View File

@@ -3,8 +3,8 @@ using System;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.Machine
{

2
Assets/Scripts/XED/Machine/AGV/AGVNode/NodeGizmoController.cs
View File

@@ -1,6 +1,6 @@
using RTG;
using UnityEngine;
using WI;
using XRLib;
namespace XED.Machine
{

2
Assets/Scripts/XED/Machine/AGV/AGV_Manager.cs
View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEngine;
using WI;
using XRLib;
namespace XED.Machine
{

2
Assets/Scripts/XED/Machine/StackerCrane/StackerCrane.cs
View File

@@ -3,7 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using WI;
using XRLib;
namespace XED
{

2
Assets/Scripts/XED/Machine/StackerCrane/StackerCraneLog.cs
View File

@@ -2,7 +2,7 @@ using JetBrains.Annotations;
using System.Diagnostics;
using System.IO;
using TriLibCore.Dae.Schema;
using WI;
using XRLib;
using static XED.StackerCrane;
namespace XED

2
Assets/Scripts/XED/Machine/StackerCrane/StackerCraneManager.cs
View File

@@ -1,7 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using WI;
using XRLib;
namespace XED
{

2
Assets/Scripts/XED/Machine/StackerCrane/WorkController.cs
View File

@@ -3,7 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using WI;
using XRLib;
namespace XED
{

4
Assets/Scripts/XED/Managers/AssetManager.cs
View File

@@ -4,8 +4,8 @@ using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using UnityEngine.ResourceManagement.ResourceLocations;
using WI;
using WI.Util;
using XRLib;
using XRLib.Util;
using System.IO;
using System.Runtime.CompilerServices;
using TriLibCore;

88
Assets/Scripts/XED/Managers/EventConnector.cs
View File

@@ -1,7 +1,7 @@
using UnityEngine;
using WI;
using XRLib;
using XED.UI;
using WI.UI;
using XRLib.UI;
using XED.Util;
using XED.Manage;
using XED.Asset;
@@ -16,25 +16,25 @@ namespace XED.Manage
{
public override void AfterAwake()
{
var canvas_top = FindSingle<Canvas_Top>();
var canvas_Windows = FindSingle<Canvas_Windows>();
var canvas_Popup = FindSingle<Canvas_Popup>();
var customAssetConnector = FindSingle<CustomAssetConnector>();
var userInputManager = FindSingle<UserInputManager>();
var agvNodeManager = FindSingle<AGVNodeManager>();
var rayCaster = FindSingle<Raycaster>();
var agvNodeLinkManager = FindSingle<AGVNodeLinkManager>();
var nodeGizmoController = FindSingle<NodeGizmoController>();
var statusPanel = FindSingle<ModePanel>();
var canvas_static = FindSingle<Canvas_Static>();
var canvas_Popup = FindSingle<Canvas_Popup>();
var canvas_Windows = FindSingle<Canvas_Windows>();
var agvManager = FindSingle<AGV_Manager>();
var wallBuilder = FindSingle<WallBuilder>();
var objectHandler = FindFirstObjectByType<RenderObjectHandler>();
var statusPanel = FindSingle<StatusPanel>();
var agvNodeManager = FindSingle<AGVNodeManager>();
var userInputManager = FindSingle<UserInputManager>();
var agvNodeLinkManager = FindSingle<AGVNodeLinkManager>();
var nodeGizmoController = FindSingle<NodeGizmoController>();
var customAssetConnector = FindSingle<CustomAssetConnector>();
var renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
GameObject assetWindow = canvas_Windows.panel_assetlibrary.gameObject;
GameObject componentWindow = canvas_Windows.panel_componentlibrary.gameObject;
SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData;
RenderObjectHandler renderObjectHandler = customAssetConnector.renderObjectHandler;
GameObject componentWindow = canvas_Windows.panel_componentlibrary.gameObject;
UIConnection();
StatusConnection();
@@ -57,6 +57,7 @@ namespace XED.Manage
renderObjectHandler.onDragBegin += canvas_Popup.panel_draghandler.OnBeginDrag;
renderObjectHandler.onDragEnd += canvas_Popup.panel_draghandler.OnEndDrag;
renderObjectHandler.onDragForceEnd += canvas_Popup.panel_draghandler.ForceEndDrag;
saveLoadFBXData.onBeginLoadAsset += (() => assetWindow.SetActive(true));
canvas_Windows.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
@@ -77,29 +78,28 @@ namespace XED.Manage
void UIConnection()
{
//Panel_ShortCut
canvas_top.panel_shortcuts.onClickOpenAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
canvas_top.panel_shortcuts.onClickOpenComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
canvas_top.panel_shortcuts.onClickUndo += CommandManager.I.Undo;
canvas_top.panel_shortcuts.onClickRedo += CommandManager.I.Redo;
canvas_static.panel_shortcuts.onClickOpenAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
canvas_static.panel_shortcuts.onClickOpenComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
canvas_static.panel_shortcuts.onClickUndo += CommandManager.I.Undo;
canvas_static.panel_shortcuts.onClickRedo += CommandManager.I.Redo;
//Panel Header
canvas_top.panel_topbar.onClickLoadAssets += saveLoadFBXData.LoadLocalFBXDirectory;
canvas_top.panel_topbar.onClickAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
canvas_top.panel_topbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
canvas_static.panel_topbar.onClickLoadAssets += saveLoadFBXData.LoadLocalFBXDirectory;
canvas_static.panel_topbar.onClickAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
canvas_static.panel_topbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
//Panel Toolbar
canvas_top.panel_toolbar.onClickMove += renderObjectHandler.SetRTGMove;
canvas_top.panel_toolbar.onClickExpand += renderObjectHandler.SetRTGScale;
canvas_top.panel_toolbar.onClickRotate += renderObjectHandler.SetRTGRotate;
canvas_top.panel_toolbar.onClickRemove += renderObjectHandler.RemoveItem;
canvas_top.panel_toolbar.onClickCopy += renderObjectHandler.CopyItem;
canvas_top.panel_toolbar.onClickAGVMode += () => statusPanel.SetStatus(StatusPanel.ProgramStatus.AGVPathDrawing);
canvas_top.panel_toolbar.onClickStartDrawWall += wallBuilder.SetDrawState;
canvas_top.panel_toolbar.onClickStartDrawWall += (a) => statusPanel.SetStatus(StatusPanel.ProgramStatus.WallDrawing);
canvas_static.panel_toolbar.onClickMove += renderObjectHandler.SetRTGMove;
canvas_static.panel_toolbar.onClickExpand += renderObjectHandler.SetRTGScale;
canvas_static.panel_toolbar.onClickRotate += renderObjectHandler.SetRTGRotate;
canvas_static.panel_toolbar.onClickRemove += renderObjectHandler.RemoveItem;
canvas_static.panel_toolbar.onClickCopy += renderObjectHandler.CopyItem;
canvas_top.panel_toolbar.onClickModifyWall += wallBuilder.SetDrawState;
canvas_top.panel_toolbar.onClickRemoveWall += wallBuilder.SetDrawState;
canvas_top.panel_toolbar.onClickEndWall += wallBuilder.SetDrawState;
canvas_static.panel_toolbar.onClickStartDrawWall += wallBuilder.DrawWallStart;
canvas_static.panel_toolbar.onClickModifyWall += wallBuilder.SetDrawState;
canvas_static.panel_toolbar.onClickRemoveWall += wallBuilder.SetDrawState;
canvas_static.panel_toolbar.onClickEndWall += wallBuilder.SetDrawState;
canvas_Popup.agvnodepopup.Button_Plus.onClick.AddListener(agvNodeManager.AddNode);
canvas_Popup.agvnodepopup.Button_Minus.onClick.AddListener(agvNodeManager.RemoveNode);
@@ -110,20 +110,20 @@ namespace XED.Manage
canvas_Popup.agvnodemodepopup.Button_AGVNodeSave.onClick.AddListener(agvNodeManager.Save);
canvas_Popup.agvnodemodepopup.onAGVNodeModeChanged += agvNodeManager.ChangeSelectMode;
canvas_Popup.panel_draghandler.onDragBoxSelect += customAssetConnector.OnDragBoxSelect;
canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing);
canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing);
}
void StatusConnection()
{
statusPanel.AddPrevStatusEvent(StatusPanel.ProgramStatus.ObjectLayout, objectHandler.PrevStatusEvent);
statusPanel.AddPrevStatusEvent(StatusPanel.ProgramStatus.WallDrawing, wallBuilder.PrevStatusEvent);
statusPanel.AddPrevStatusEvent(StatusPanel.ProgramStatus.AGVPathDrawing, agvNodeManager.PrevStatusEvent);
statusPanel.AddController(renderObjectHandler);
statusPanel.AddController(wallBuilder);
statusPanel.AddController(agvNodeManager);
statusPanel.AddCurrentStatusEvent(StatusPanel.ProgramStatus.ObjectLayout, objectHandler.CurrentStatusEvent);
statusPanel.AddCurrentStatusEvent(StatusPanel.ProgramStatus.WallDrawing, wallBuilder.CurrentStatusEvent);
statusPanel.AddCurrentStatusEvent(StatusPanel.ProgramStatus.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open);
statusPanel.AddCurrentStatusEvent(StatusPanel.ProgramStatus.AGVPathDrawing, agvNodeManager.CurrentStatusEvent);
statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open);
statusPanel.SetStatus(StatusPanel.ProgramStatus.ObjectLayout);
statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
}
void DefaultActionSetting()
@@ -131,15 +131,15 @@ namespace XED.Manage
var commandHandler = CommandManager.I.GetInputHandler();
userInputManager.SetHandler(GetDefaultInputHandler());
userInputManager.SetHandler(commandHandler);
canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
//canvas_static.panel_modecontrol.onClickPropertyMode += () => statusPanel.SetMode(ModePanel.ProgramMode.None);
rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip;
rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip;
rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate);
//rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate);
}
}
InputHandler defaultInputHandler;
InputHandler GetDefaultInputHandler()
{

68
Assets/Scripts/XED/Managers/ModePanel.cs Normal file
View File

@@ -0,0 +1,68 @@
using JetBrains.Annotations;
using System;
using System.Collections.Generic;
using UnityEngine;
using XRLib;
using XED.Interfaces;
using XED.Util;
namespace XED.Manage
{
public class ModePanel : MonoBehaviour, ISingle
{
public enum ProgramMode
{
None,
WallDrawing,
ObjectLayout,
AGVPathDrawing
}
public ProgramMode currentMode;
Dictionary<ProgramMode, Action> statusEnterEventTable = new();
Dictionary<ProgramMode, Action> statusExitEventTable = new();
public void SetMode(ProgramMode newMode)
{
if (statusExitEventTable.TryGetValue(currentMode, out Action action))
{
Debug.Log($"Prev Status Event : {currentMode}");
action?.Invoke();
}
currentMode = newMode;
if (statusEnterEventTable.TryGetValue(currentMode, out Action action2))
{
Debug.Log($"Curr Status Event : {currentMode}");
action2?.Invoke();
}
}
public void AddModeExitEvent(ProgramMode targetStatus, Action evt)
{
if (!statusExitEventTable.ContainsKey(targetStatus))
{
statusExitEventTable.Add(targetStatus, null);
}
statusExitEventTable[targetStatus] += evt;
}
public void AddModeEnterEvent(ProgramMode status, Action evt)
{
if (!statusEnterEventTable.ContainsKey(status))
{
statusEnterEventTable.Add(status, null);
}
statusEnterEventTable[status] += evt;
}
internal void AddController(IModeController controller)
{
var status = controller.mode;
AddModeEnterEvent(status, controller.StatusEnterEvent);
AddModeExitEvent(status, controller.StatusExitEvent);
}
}
}

2
Assets/Scripts/XED/Managers/ModePanel.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ee0d8336379a74f44adbe97ba6c56982

19
Assets/Scripts/XED/Managers/ObjectHandler.cs Normal file
View File

@@ -0,0 +1,19 @@
namespace XED.Manage
{
public class ObjectHandler
{
public enum HandlingType
{
Normal,
Property,
}
public HandlingType handlingType = HandlingType.Normal;
public void SetHandlingType(HandlingType type)
{
handlingType = type;
}
}
}

2
Assets/Scripts/XED/Managers/ObjectHandler.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: a75f4b14385d88d46aeee45f7473f757

2
Assets/Scripts/XED/Managers/ObjectPoolManager.cs
View File

@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Pool;
using WI;
using XRLib;
using XED.Interfaces;
namespace XED.Manage

59
Assets/Scripts/XED/Managers/StatusPanel.cs
View File

@@ -1,59 +0,0 @@
using JetBrains.Annotations;
using System;
using System.Collections.Generic;
using UnityEngine;
using WI;
namespace XED.Manage
{
public class StatusPanel : MonoBehaviour, ISingle
{
public enum ProgramStatus
{
None,
WallDrawing,
ObjectLayout,
AGVPathDrawing
}
public ProgramStatus currentStatus;
Dictionary<ProgramStatus, Action> currStatusEventTable = new();
Dictionary<ProgramStatus, Action> prevStatusEventTable = new();
public void SetStatus(ProgramStatus newStatus)
{
if (prevStatusEventTable.TryGetValue(currentStatus, out Action action))
{
Debug.Log($"Prev Status Event : {currentStatus}");
action?.Invoke();
}
currentStatus = newStatus;
if (currStatusEventTable.TryGetValue(currentStatus, out Action action2))
{
Debug.Log($"Curr Status Event : {currentStatus}");
action2?.Invoke();
}
}
public void AddPrevStatusEvent(ProgramStatus targetStatus, Action evt)
{
if (!prevStatusEventTable.ContainsKey(targetStatus))
{
prevStatusEventTable.Add(targetStatus, null);
}
prevStatusEventTable[targetStatus] += evt;
}
public void AddCurrentStatusEvent(ProgramStatus status, Action evt)
{
if (!currStatusEventTable.ContainsKey(status))
{
currStatusEventTable.Add(status, null);
}
currStatusEventTable[status] += evt;
}
}
}

2
Assets/Scripts/XED/Managers/StatusPanel.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: d98e10ccfa7c43c44bf480f61f6d124e

2
Assets/Scripts/XED/Managers/UserInputManager.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using WI;
using XRLib;
namespace XED.Manage
{

2
Assets/Scripts/XED/TwinObject/TwinPhysics.cs
View File

@@ -1,6 +1,6 @@
using System;
using UnityEngine;
using WI.Util;
using XRLib.Util;
namespace XED
{

4
Assets/Scripts/XED/UI/Canvas/Canvas_Popup.cs
View File

@@ -1,7 +1,7 @@
using UnityEngine;
using UnityEngine.EventSystems;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
using XED.UI;
using XED.Machine;

8
Assets/Scripts/XED/UI/Canvas/Canvas_Top.cs → Assets/Scripts/XED/UI/Canvas/Canvas_Static.cs
View File

@@ -1,15 +1,15 @@
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
using UnityEngine;
using XED.Manage;
namespace XED.UI
{
public class Canvas_Top : CanvasBase
public class Canvas_Static : CanvasBase
{
public Panel_ShortCuts panel_shortcuts;
public Panel_TopBar panel_topbar;
public Panel_Toolbar panel_toolbar;
public Panel_ModeControl panel_modecontrol;
}
}

0
Assets/Scripts/XED/UI/Canvas/Canvas_Top.cs.meta → Assets/Scripts/XED/UI/Canvas/Canvas_Static.cs.meta
View File

4
Assets/Scripts/XED/UI/Canvas/Canvas_Windows.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
{

4
Assets/Scripts/XED/UI/Panel/Panel_AccessibilitySettings.cs
View File

@@ -4,8 +4,8 @@ using TMPro;
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI

2
Assets/Scripts/XED/UI/Panel/Panel_AssetLibrary.cs
View File

@@ -1,5 +1,5 @@
using UnityEngine;
using WI.UI;
using XRLib.UI;
using XED.Hierarchy;
namespace XED.UI

4
Assets/Scripts/XED/UI/Panel/Panel_ColorPicker.cs
View File

@@ -4,8 +4,8 @@ using System;
using TriLibCore.Dae.Schema;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI

2
Assets/Scripts/XED/UI/Panel/Panel_ComponentLibrary.cs
View File

@@ -1,5 +1,5 @@
using UnityEngine;
using WI.UI;
using XRLib.UI;
using XED.Core;
using XED.Hierarchy;

2
Assets/Scripts/XED/UI/Panel/Panel_DragHandler.cs
View File

@@ -2,7 +2,7 @@ using System.Collections;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/Panel/Panel_ObjectAlign.cs
View File

@@ -3,7 +3,7 @@ using UnityEngine;
using UnityEngine.UI;
using XED.Asset;
using XED.Util;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

4
Assets/Scripts/XED/UI/Panel/Panel_ObjectDistanceLabelList.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/Panel/Panel_ObjectInfo.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using WI.UI;
using XRLib.UI;
using XED.Manage;
using System.Linq;

4
Assets/Scripts/XED/UI/Panel/Panel_ObjectTool.cs
View File

@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
{

4
Assets/Scripts/XED/UI/Panel/Panel_PropertyViewer.cs
View File

@@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Reflection;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
using XED.UI;
using XED.Attributes;
using TMPro;

4
Assets/Scripts/XED/UI/Panel/Panel_ShortCuts.cs
View File

@@ -1,8 +1,8 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
using XED.Core;
namespace XED.UI

6
Assets/Scripts/XED/UI/Panel/Panel_Toolbar.cs
View File

@@ -1,6 +1,6 @@
using System;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
using static XED.WallBuilder;
namespace XED.UI
@@ -32,7 +32,7 @@ namespace XED.UI
public event Action onClickMeasurementMode;
public event Action onClickUnit;
public event Action onClickAGVMode;
public event Action<BuilderState> onClickStartDrawWall;
public event Action onClickStartDrawWall;
public event Action<BuilderState> onClickModifyWall;
public event Action<BuilderState> onClickRemoveWall;
public event Action<BuilderState> onClickEndWall;
@@ -67,7 +67,7 @@ namespace XED.UI
private void OnClickStartWall()
{
onClickStartDrawWall?.Invoke(BuilderState.Drawing);
onClickStartDrawWall?.Invoke();
}
private void OnClicEndDrawWall()
{

2
Assets/Scripts/XED/UI/Panel/Panel_Tooltip.cs
View File

@@ -5,7 +5,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/Panel/Panel_TopBar.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine.UI;
using System;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{
public class Panel_TopBar : PanelBase

4
Assets/Scripts/XED/UI/Panel/Panel_WallDrawTool.cs
View File

@@ -1,5 +1,5 @@
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/Tag/UI_GUIWindow.cs
View File

@@ -4,7 +4,7 @@ using UnityEditor.SceneManagement;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/Tag/UI_TooltipOwner.cs
View File

@@ -1,5 +1,5 @@
using UnityEngine;
using WI.UI;
using XRLib.UI;
namespace XED
{

2
Assets/Scripts/XED/UI/TreeView/ScrollViewMenu_ImportExport.cs
View File

@@ -2,7 +2,7 @@ using System.Collections;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
using XED.Asset;
using XED.Hierarchy;

4
Assets/Scripts/XED/UI/UI_DistanceLabel.cs
View File

@@ -1,8 +1,8 @@
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using WI;
using WI.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
{

2
Assets/Scripts/XED/UI/UI_DragDrop.cs
View File

@@ -3,7 +3,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using WI.UI;
using XRLib.UI;
using static DrawLine;
namespace XED.UI

2
Assets/Scripts/XED/UI/UI_PropertyViewerInfo.cs
View File

@@ -2,7 +2,7 @@ using System.Reflection;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using WI.UI;
using XRLib.UI;
namespace XED.UI
{

4
Assets/Scripts/XRLib/Behaviour/MonoBehaviour.cs
View File

@@ -1,7 +1,7 @@
using System;
using UnityEngine;
using UnityEngineInternal;
using WI;
using XRLib;
using Object = UnityEngine.Object;
[Serializable]
@@ -111,6 +111,6 @@ public partial class MonoBehaviour : UnityEngine.MonoBehaviour
protected virtual void OnDestroy()
{
if (this.GetType() != typeof(TrashBehaviour))
WI.Core.Unregist(this);
XRLib.Core.Unregist(this);
}
}

2
Assets/Scripts/XRLib/Behaviour/TrashBehaviour.cs
View File

@@ -1,4 +1,4 @@
namespace WI
namespace XRLib
{
public partial class TrashBehaviour : UnityEngine.MonoBehaviour
{

2
Assets/Scripts/XRLib/Core/Core.cs
View File

@@ -8,7 +8,7 @@ using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
using Object = UnityEngine.Object;
namespace WI
namespace XRLib
{
public static partial class Core
{

2
Assets/Scripts/XRLib/Core/FieldBinder.cs
View File

@@ -4,7 +4,7 @@ using System.Reflection;
using UnityEngine;
using UnityEngine.Video;
namespace WI
namespace XRLib
{
public static partial class FieldBinder
{

2
Assets/Scripts/XRLib/Core/Hooker.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
namespace WI
namespace XRLib
{
public partial class Hooker
{

4
Assets/Scripts/XRLib/Core/Initializer.cs
View File

@@ -1,9 +1,9 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using WI.UI;
using XRLib.UI;
namespace WI
namespace XRLib
{
[DefaultExecutionOrder(int.MinValue)]
public partial class Initializer : MonoBehaviour,ISingle

2
Assets/Scripts/XRLib/Core/Label.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace WI
namespace XRLib
{
[AttributeUsage(AttributeTargets.Field)]
public partial class Label : Attribute

2
Assets/Scripts/XRLib/CustomPlayerLoop/PlayerLoopInterface.cs
View File

@@ -4,7 +4,7 @@ using System.Text;
using UnityEngine;
using UnityEngine.LowLevel;
namespace WI
namespace XRLib
{
public static partial class PlayerLoopInterface
{

4
Assets/Scripts/XRLib/Example/BindingTester.cs
View File

@@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using UnityEngine;
using WI;
using XRLib;
namespace WI.Test
namespace XRLib.Test
{
public class BindingTester : MonoBehaviour
{

2
Assets/Scripts/XRLib/Extenstions/ReflectionExtension.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Reflection;
namespace WI
namespace XRLib
{
public static partial class ReflectionExtension
{

2
Assets/Scripts/XRLib/Extenstions/ScrollRectExtension.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine;
using UnityEngine.UI;
using static UnityEngine.UI.Button;
namespace WI
namespace XRLib
{
public static class ScrollRectExtension
{

2
Assets/Scripts/XRLib/Extenstions/TransformExtension.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using UnityEngine;
namespace WI
namespace XRLib
{
public static class TransformExtension
{

2
Assets/Scripts/XRLib/GenericController/GenericController.cs
View File

@@ -3,7 +3,7 @@ using System.Threading;
using UnityEngine;
using UnityEngine.EventSystems;
namespace WI
namespace XRLib
{
public enum ViewMode
{

2
Assets/Scripts/XRLib/GenericController/GenericControllerOption.cs
View File

@@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace WI
namespace XRLib
{
public abstract class GenericControllerOption : ScriptableObject, ISerializationCallbackReceiver
{

2
Assets/Scripts/XRLib/GenericController/MaxRangeLimitter.cs
View File

@@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace WI
namespace XRLib
{
public class MaxRangeLimitter
{

2
Assets/Scripts/XRLib/GenericController/Orbital/OrbitalController.cs
View File

@@ -2,7 +2,7 @@
using System.Collections;
using UnityEngine;
namespace WI
namespace XRLib
{
//TODO::Something... Util Functions
public class OrbitalController : GenericController, ISingle

2
Assets/Scripts/XRLib/GenericController/Orbital/OrbitalControllerOption.cs
View File

@@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace WI
namespace XRLib
{
[CreateAssetMenu(fileName = "OrbitalControllerOption", menuName = "GenericControllerOption/OrbitalControllerOption")]

2
Assets/Scripts/XRLib/GenericController/Orbital/OrbitalControllerTarget.cs
View File

@@ -1,4 +1,4 @@
namespace WI
namespace XRLib
{
public class OrbitalControllerTarget : MonoBehaviour, ISingle{ }
}

2
Assets/Scripts/XRLib/GenericController/Orbital/OutlineCamera.cs
View File

@@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace WI
namespace XRLib
{
public class OutlineCamera : MonoBehaviour
{

4
Assets/Scripts/XRLib/GenericController/Raycaster.cs
View File

@@ -9,7 +9,7 @@ using UnityEngine.EventSystems;
using UnityEngine.UI;
using XED;
namespace WI
namespace XRLib
{
[DefaultExecutionOrder(int.MinValue)]
public class Raycaster : MonoBehaviour, ISingle
@@ -82,7 +82,7 @@ namespace WI
{
foreach(var e in eventList)
{
e.Item1.Invoke(e.Item2, e.Item3);
e.Item1?.Invoke(e.Item2, e.Item3);
}
eventList.Clear();
}

2
Assets/Scripts/XRLib/Interface/ISingle.cs
View File

@@ -1,4 +1,4 @@
namespace WI
namespace XRLib
{
public interface ISingle { }
}

2
Assets/Scripts/XRLib/UI/CanvasBase.cs
View File

@@ -1,4 +1,4 @@
namespace WI.UI
namespace XRLib.UI
{
public abstract class CanvasBase : UIBase, ISingle
{

2
Assets/Scripts/XRLib/UI/LocalizationHelper.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine.Localization;
using UnityEngine.Localization.Components;
using UnityEngine.ResourceManagement.AsyncOperations;
namespace WI.UI
namespace XRLib.UI
{
public class LocalizationHelper : LocalizeStringEvent
{

2
Assets/Scripts/XRLib/UI/PanelBase.cs
View File

@@ -1,4 +1,4 @@
namespace WI.UI
namespace XRLib.UI
{
public abstract class PanelBase : UIBase
{

2
Assets/Scripts/XRLib/UI/PanelBaseExtension.cs
View File

@@ -1,5 +1,5 @@
namespace WI.UI
namespace XRLib.UI
{
public static class PanelBaseExtension
{

Some files were not shown because too many files have changed in this diff Show More