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

Model Positioning Menu #256

Merged
merged 42 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
79bb2f1
Model stepping menu UI and basic spatial point controls
vanhalenar Feb 24, 2024
5af9516
Added UnhighlightAllAxis method to Gizmo, modified ModelSteppingMenu
vanhalenar Feb 24, 2024
dc5c1bc
Cleaned up code a bit
vanhalenar Feb 25, 2024
f71dc6f
added ability to move point along planes
vanhalenar Feb 28, 2024
ec623de
Merge remote-tracking branch 'upstream/master'
vanhalenar Feb 29, 2024
6034d04
updated models dll
vanhalenar Feb 29, 2024
0c458b9
New models, updated build_models.sh, minor changes to work with new m…
vanhalenar Feb 29, 2024
f58dd78
all build_models changes
vanhalenar Mar 2, 2024
687edb3
Merge branch 'master' of https://github.com/vanhalenar/arcor2_areditor
vanhalenar Mar 2, 2024
e43512e
Added Forward-Backward arrows for moving End-Effector, added animatio…
vanhalenar Mar 5, 2024
93eb896
Temporary performance optimizations
vanhalenar Mar 7, 2024
ee8412d
Updated models to hopefully repair robot stepper
vanhalenar Mar 7, 2024
9545369
Merge branch 'master' of https://github.com/vanhalenar/arcor2_areditor
vanhalenar Mar 7, 2024
1cb6072
Almost working local IK
vanhalenar Mar 12, 2024
4a1ba27
Possibly fixed robot stepper
vanhalenar Mar 12, 2024
ed39dd1
Clipping shader
vanhalenar Mar 16, 2024
81db8fa
Modified Clipping Plane Shader
vanhalenar Mar 18, 2024
46a36f1
Working 3-Axis Clipping Shader
vanhalenar Mar 18, 2024
fdd2f6b
Minor Revisions
vanhalenar Mar 18, 2024
817e7c7
Gizmo flipping based on camera position
vanhalenar Mar 20, 2024
599b04c
Work on real robot pose setting
vanhalenar Mar 25, 2024
21a65a3
modified build_models.sh
vanhalenar Mar 25, 2024
cd06da7
Modified models
vanhalenar Mar 25, 2024
bf295e3
Merge branch 'master' of github.com:vanhalenar/arcor2_areditor
vanhalenar Mar 25, 2024
ff1dc7b
Hiding of axis and planes on move
vanhalenar Mar 25, 2024
aad3f0a
Added 'Invalid pose' message
vanhalenar Apr 1, 2024
63158e1
Forward/backward modified to operate in the horizontal plane
vanhalenar Apr 1, 2024
8e3bf31
Stripped but semi-working user-space movement system
vanhalenar Apr 2, 2024
3fe6284
movement in user-space system
vanhalenar Apr 2, 2024
34460d5
All axis updated for user-space movement capabilities
vanhalenar Apr 2, 2024
0c078d7
Gizmo flipping and Clipping Plane flipping based on camera position, …
vanhalenar Apr 3, 2024
1d43e4e
UI for user/world space toggle.
vanhalenar Apr 5, 2024
1f54667
Minor bug fixes
vanhalenar Apr 5, 2024
cc692f4
Added red shader for invalid poses, added back forward/backward buttons
vanhalenar Apr 8, 2024
99b1419
merged upstream
vanhalenar Apr 9, 2024
d1ccada
Added multi-robot support + other changes (forgot to make commits sorry)
vanhalenar Apr 25, 2024
c89cf25
Slider value range shifting to more comprehensible values
vanhalenar May 1, 2024
087d805
Renamed ModelSteppingMenu to ModelPositioningMenu
vanhalenar May 1, 2024
c04b706
Unified selection methods
vanhalenar May 6, 2024
1d2d9f9
Added header comments, refactored
vanhalenar May 6, 2024
7505cb3
Removed unused code and comments
vanhalenar May 6, 2024
d1d7545
Modified files requested in PR
vanhalenar May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arcor2_AREditor/Assets/BASE/Icons/icons8_robot_model_96px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions arcor2_AREditor/Assets/BASE/Icons/icons8_robot_model_96px.png.meta

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

3 changes: 3 additions & 0 deletions arcor2_AREditor/Assets/BASE/Icons/trash_white_scaled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions arcor2_AREditor/Assets/BASE/Icons/trash_white_scaled.png.meta

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

4 changes: 2 additions & 2 deletions arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ private void OnSceneBaseUpdated(object sender, BareSceneEventArgs args) {
/// </summary>
/// <param name="sender">Who invoked event.</param>
/// <param name="args">Robot joints data</param>
private async void RobotJointsUpdated(object sender, RobotJointsUpdatedEventArgs args) {
public async void RobotJointsUpdated(object sender, RobotJointsUpdatedEventArgs args) {
Kapim marked this conversation as resolved.
Show resolved Hide resolved
// if initializing or deinitializing scene OR scene is not started, dont update robot joints
if (!Valid || !SceneStarted)
return;
Expand All @@ -439,7 +439,7 @@ private async void RobotJointsUpdated(object sender, RobotJointsUpdatedEventArgs
/// </summary>
/// <param name="sender"></param>
/// <param name="args">Robot ee data</param>
private async void RobotEefUpdated(object sender, RobotEefUpdatedEventArgs args) {
public async void RobotEefUpdated(object sender, RobotEefUpdatedEventArgs args) {
if (!RobotsEEVisible || !Valid) {
return;
}
Expand Down
21 changes: 21 additions & 0 deletions arcor2_AREditor/Assets/BASE/Scripts/URDF/RobotActionObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using RosSharp.Urdf;
using TMPro;
using UnityEngine;
using static UnityEditor.Recorder.OutputPath;

namespace Base {

Expand Down Expand Up @@ -386,6 +387,26 @@ public override void SetVisibility(float value, bool forceShaderChange = false)
UpdateColor();
}

public void EnableStandardShader() {
foreach (Renderer i in robotRenderers) {
if (i.materials.Length == 3) {
i.materials[1].shader = Shader.Find("Standard");
} else {
i.material.shader = Shader.Find("Standard");
}
}
}

public void EnableInvalidShader() {
foreach (Renderer i in robotRenderers) {
if (i.materials.Length == 3) {
i.materials[1].shader = Shader.Find("InvalidPose");
} else {
i.material.shader = Shader.Find("InvalidPose");
}
}
}


public async Task<List<string>> GetEndEffectorIds(string arm_id = null) {
await LoadResources();
Expand Down
35 changes: 35 additions & 0 deletions arcor2_AREditor/Assets/DraggablePoint.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* DraggablePoint
* Author: Timotej Halenár
* Login: xhalen00
* Bachelor's Thesis
* VUT FIT 2024
*
* */
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class DraggablePoint : MonoBehaviour
{
[SerializeField] private OutlineOnClick outline;
// Start is called before the first frame update
void Start()
{

}

public void Highlight() {
outline.Highlight();
}

public void Unhighlight() {
outline.UnHighlight();
}

// Update is called once per frame
void Update()
{

}
}
11 changes: 11 additions & 0 deletions arcor2_AREditor/Assets/DraggablePoint.cs.meta

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

Loading
Loading