AblativeAbsolute/rimworld-animation-studio
1
0
Fork 0
mirror of https://gitgud.io/AbstractConcept/rimworld-animation-studio.git synced 2024-08-15 00:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI revisions

Browse source
This commit is contained in:
AbstractConcept 2022-09-25 01:15:27 -05:00
parent 007e2dd513
commit 1e2c4fa6bf
68 changed files with 2516 additions and 1100 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Assets/Resources/Prefabs/DialogBox.prefab
View file

@ -201,7 +201,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 260, y: 200}
m_SizeDelta: {x: 400, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7715503544115872490
CanvasRenderer:
@ -383,8 +383,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -115}
m_SizeDelta: {x: 260, y: 30}
m_AnchoredPosition: {x: 0, y: -165}
m_SizeDelta: {x: 400, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7715503544528335665
CanvasRenderer:
@ -512,8 +512,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 140}
m_SizeDelta: {x: 260, y: 80}
m_AnchoredPosition: {x: 0, y: 190}
m_SizeDelta: {x: 400, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7715503544597145776
CanvasRenderer:
@ -774,10 +774,10 @@ RectTransform:
m_Father: {fileID: 7715503544597145778}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 260, y: 80}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7715503544946347197
CanvasRenderer:
@ -858,8 +858,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 200}
m_SizeDelta: {x: 20, y: 200}
m_AnchoredPosition: {x: 0, y: 300}
m_SizeDelta: {x: 20, y: 300}
m_Pivot: {x: 1, y: 1}
--- !u!222 &7715503544952922354
CanvasRenderer:

3357
Assets/Scenes/SampleScene.unity
View file

File diff suppressed because it is too large Load diff

2
Assets/Scripts/AdvancedPolygonCollider/AdvancedPolygonCollider.cs
View file

@ -494,7 +494,7 @@ namespace DigitalRuby.AdvancedPolygonCollider
#endif
Debug.Log("Updated polygon.");
//Debug.Log("Updated polygon.");
}
catch (Exception ex)
{

13
Assets/Scripts/GUI/ActorCard.cs
View file

@ -15,6 +15,7 @@ namespace RimWorldAnimationStudio
public InputField raceOffsetXField;
public InputField raceOffsetZField;
public Toggle initiatorToggle;
public Dropdown selectActorLayerDropdown;
public void Initialize()
{
@ -68,7 +69,17 @@ namespace RimWorldAnimationStudio
float.TryParse(raceOffsetZField.text, out z);
actor.SetAlienRaceOffset(new Vector2(x, z));
Workspace.Instance.RecordEvent("Actor body type offset data");
Workspace.Instance.RecordEvent("Actor body offset data");
}
public void OnActorLayerChange()
{
PawnAnimationClip clip = Workspace.Instance.GetCurrentPawnAnimationClip();
if (clip == null) return;
clip.layer = selectActorLayerDropdown.captionText.text;
Workspace.Instance.RecordEvent("Actor render layer " + clip.layer);
}
public void Update()

12
Assets/Scripts/Managers/ApplicationManager.cs
View file

@ -87,22 +87,14 @@ namespace RimWorldAnimationStudio
RunPostLoadOperations(animationDef);
Debug.Log("Loaded AnimationDef: " + animationDef.defName);
Workspace.animationDef = animationDef;
animationDef.Initialize();
Workspace.Instance.ClearHistory();
Workspace.Instance.RecordEvent("AnimationDef loaded");
AnimationController.Instance.MakeDirty();
var animationDefCards = Resources.FindObjectsOfTypeAll(typeof(AnimationDefCard)) as AnimationDefCard[];
if (animationDefCards != null)
{
animationDefCards[0].Initialize();
animationDefCards[0].gameObject.SetActive(true);
}
}
public void RunPostLoadOperations(AnimationDef animationDef)

16
Assets/Scripts/Managers/CameraController.cs
View file

@ -48,25 +48,9 @@ namespace RimWorldAnimationStudio
curZoom += Input.GetAxis("Mouse ScrollWheel") * scrollSpeed * 0.1f;
curZoom = Mathf.Clamp(curZoom, maxZoom, minZoom);
Vector3 cameraPosition = Vector3.Lerp(transform.position, new Vector3(x, y, -10), 0.2f);
transform.position = cameraPosition;
cam.orthographicSize = Mathf.Abs(curZoom);
}
public void SetPosition(Vector3 position)
{
x = position.x;
y = position.y;
transform.position = position;
}
public void SetZoom(float zoom)
{
this.zoom = Mathf.Clamp(zoom, maxZoom, minZoom);
}
public void StartMouseDrag()
{
Vector3 delta = cam.ScreenToWorldPoint(Input.mousePosition) - cam.transform.position;

2
Assets/SelectRaceDropdown.cs
View file

@ -14,7 +14,7 @@ namespace RimWorldAnimationStudio
private int actorID = -1;
private int hashcode = -1;
public void Start()
public void OnEnable()
{
dropdown = GetComponent<Dropdown>();
label = transform.Find("Label").GetComponent<Text>();