Skip to content
Snippets Groups Projects
Commit 93553a1e authored by John Schihada's avatar John Schihada
Browse files

String Interpolations is working

parent c52deacf
No related branches found
No related tags found
No related merge requests found
...@@ -93,7 +93,7 @@ MonoBehaviour: ...@@ -93,7 +93,7 @@ MonoBehaviour:
m_enableVertexGradient: 1 m_enableVertexGradient: 1
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1} topLeft: {r: 0, g: 0, b: 0, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1} topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1} bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1} bottomRight: {r: 1, g: 1, b: 1, a: 1}
......
...@@ -6,21 +6,6 @@ ...@@ -6,21 +6,6 @@
public static class CommunicationEvents public static class CommunicationEvents
{ {
/* public class PointEvent : UnityEvent<RaycastHit,int>
{
}
public class LineEvent : UnityEvent<int, int, int> {
}
public class FactEvent : UnityEvent<int>
{
}*/
public class HitEvent : UnityEvent<RaycastHit> public class HitEvent : UnityEvent<RaycastHit>
{ {
...@@ -56,11 +41,6 @@ public class AnimationEvent : UnityEvent<String> { ...@@ -56,11 +41,6 @@ public class AnimationEvent : UnityEvent<String> {
public static HitEvent TriggerEvent = new HitEvent(); public static HitEvent TriggerEvent = new HitEvent();
public static ToolModeEvent ToolModeChangedEvent = new ToolModeEvent(); public static ToolModeEvent ToolModeChangedEvent = new ToolModeEvent();
/*
public static FactEvent AddPointEvent = new FactEvent();
public static FactEvent AddLineEvent = new FactEvent();
public static FactEvent AddAngleEvent = new FactEvent();
*/
public static FactEvent AddFactEvent = new FactEvent(); public static FactEvent AddFactEvent = new FactEvent();
public static FactEvent RemoveFactEvent = new FactEvent(); public static FactEvent RemoveFactEvent = new FactEvent();
...@@ -72,6 +52,7 @@ public class AnimationEvent : UnityEvent<String> { ...@@ -72,6 +52,7 @@ public class AnimationEvent : UnityEvent<String> {
public static SignalEvent gameNotSucceededEvent = new SignalEvent(); public static SignalEvent gameNotSucceededEvent = new SignalEvent();
public static AnimationEvent parameterDisplayHint = new AnimationEvent(); public static AnimationEvent parameterDisplayHint = new AnimationEvent();
public static SignalEvent newAssignmentEvent = new SignalEvent();
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
......
...@@ -25,6 +25,8 @@ public void OnDrop(PointerEventData eventData){ ...@@ -25,6 +25,8 @@ public void OnDrop(PointerEventData eventData){
currentFact = eventData.pointerDrag.GetComponent<FactWrapper>().fact; currentFact = eventData.pointerDrag.GetComponent<FactWrapper>().fact;
Debug.Log("recieved Fact: " + currentFact.backendURI); Debug.Log("recieved Fact: " + currentFact.backendURI);
CommunicationEvents.newAssignmentEvent.Invoke();
} }
} }
...@@ -9,6 +9,7 @@ public class RenderedScrollFact : MonoBehaviour ...@@ -9,6 +9,7 @@ public class RenderedScrollFact : MonoBehaviour
public int ID; public int ID;
public TextMeshProUGUI LabelMesh; public TextMeshProUGUI LabelMesh;
private string _label; private string _label;
public string factUri;
public string Label public string Label
{ {
......
...@@ -98,7 +98,8 @@ public class ScrollDynamicInfo ...@@ -98,7 +98,8 @@ public class ScrollDynamicInfo
{ {
public Scroll original; public Scroll original;
public Scroll rendered; public Scroll rendered;
//public List<List<ScrollAssignmentsToBeImplemented>> completions //Todo: Adjust due to new Server-Format
public List<List<System.Object>> completions;
public Boolean valid; public Boolean valid;
public ScrollApplicationCheckingError[] errors; public ScrollApplicationCheckingError[] errors;
} }
......
...@@ -27,7 +27,7 @@ void Start() ...@@ -27,7 +27,7 @@ void Start()
if (cursor == null) cursor = GameObject.FindObjectOfType<WorldCursor>(); if (cursor == null) cursor = GameObject.FindObjectOfType<WorldCursor>();
CommunicationEvents.parameterDisplayHint.AddListener(animateScrollParameter); CommunicationEvents.parameterDisplayHint.AddListener(animateScrollParameter);
CommunicationEvents.newAssignmentEvent.AddListener(newAssignment);
} }
public void setScroll(Scroll s) public void setScroll(Scroll s)
...@@ -57,9 +57,12 @@ public void setScroll(Scroll s) ...@@ -57,9 +57,12 @@ public void setScroll(Scroll s)
var originalScrollFact = originalObj.transform.GetChild(0).GetComponent<RenderedScrollFact>(); var originalScrollFact = originalObj.transform.GetChild(0).GetComponent<RenderedScrollFact>();
originalScrollFact.ID = i; originalScrollFact.ID = i;
originalScrollFact.Label = s.requiredFacts[i].label; originalScrollFact.Label = s.requiredFacts[i].label;
originalScrollFact.factUri = s.requiredFacts[i].@ref.uri;
//Copy original Object for use in redered Scroll //Copy original Object for use in redered Scroll
var renderedObj = Instantiate(originalObj); var renderedObj = Instantiate(originalObj);
//Set Text Color to red
renderedObj.transform.GetChild(1).GetComponent<TextMeshProUGUI>().color = new Color32(255,0,0,255);
originalObj.transform.SetParent(originalViewport.GetChild(0)); originalObj.transform.SetParent(originalViewport.GetChild(0));
renderedObj.transform.SetParent(renderedViewport.GetChild(0)); renderedObj.transform.SetParent(renderedViewport.GetChild(0));
...@@ -71,7 +74,18 @@ public void setScroll(Scroll s) ...@@ -71,7 +74,18 @@ public void setScroll(Scroll s)
ParameterDisplays.Add(originalObj); ParameterDisplays.Add(originalObj);
} }
}
public void updateRenderedScroll(Scroll rendered)
{
Transform renderedScroll = gameObject.transform.GetChild(2).transform;
renderedScroll.GetChild(0).GetComponent<TextMeshProUGUI>().text = rendered.description;
for (int i = 0; i < rendered.requiredFacts.Count; i++) {
var obj = ParameterDisplays.Find(x => x.transform.GetChild(0).GetComponent<RenderedScrollFact>().factUri.Equals(rendered.requiredFacts[i].@ref.uri));
obj.transform.GetChild(0).GetComponent<DropHandling>().associatedDropHandling.transform.parent
.GetChild(0).GetComponent<RenderedScrollFact>().Label = rendered.requiredFacts[i].label;
}
} }
public void animateScrollParameter(string label) public void animateScrollParameter(string label)
...@@ -85,22 +99,37 @@ public void animateScrollParameter(string label) ...@@ -85,22 +99,37 @@ public void animateScrollParameter(string label)
public void magicButton() public void magicButton()
{ {
List<Scroll.ScrollFact> pushoutFacts = sendView(); string answer = sendView("/scroll/apply");
if (pushoutFacts == null)
if (answer == null)
{ {
Debug.Log("DAS HAT NICHT GEKLAPPT"); Debug.Log("DAS HAT NICHT GEKLAPPT");
//TODO: hier ne Art PopUp, wo drin steht, dass das nicht geklappt hat //TODO: hier ne Art PopUp, wo drin steht, dass das nicht geklappt hat
CommunicationEvents.PushoutFactFailEvent.Invoke(null); CommunicationEvents.PushoutFactFailEvent.Invoke(null);
return; return;
} }
List<Scroll.ScrollFact> pushoutFacts = JsonConvert.DeserializeObject<List<Scroll.ScrollFact>>(answer);
readPushout(pushoutFacts); readPushout(pushoutFacts);
} }
private List<Scroll.ScrollFact> sendView() public void newAssignment()
{
string answer = sendView("/scroll/dynamic");
if (answer == null)
{
Debug.Log("DAS HAT NICHT GEKLAPPT");
return;
}
Scroll.ScrollDynamicInfo scrollDynamicInfo = JsonConvert.DeserializeObject<Scroll.ScrollDynamicInfo>(answer);
updateRenderedScroll(scrollDynamicInfo.rendered);
}
private string sendView(string endpoint)
{ {
string body = prepareScrollAssignments(); string body = prepareScrollAssignments();
UnityWebRequest www = UnityWebRequest.Put(CommunicationEvents.ServerAdress+"/scroll/apply", body); UnityWebRequest www = UnityWebRequest.Put(CommunicationEvents.ServerAdress + endpoint, body);
www.method = UnityWebRequest.kHttpVerbPOST; www.method = UnityWebRequest.kHttpVerbPOST;
www.SetRequestHeader("Content-Type", "application/json"); www.SetRequestHeader("Content-Type", "application/json");
var async = www.Send(); var async = www.Send();
...@@ -115,7 +144,7 @@ public void magicButton() ...@@ -115,7 +144,7 @@ public void magicButton()
{ {
string answer = www.downloadHandler.text; string answer = www.downloadHandler.text;
Debug.Log(answer); Debug.Log(answer);
return JsonConvert.DeserializeObject<List<Scroll.ScrollFact>>(answer); return answer;
} }
} }
...@@ -140,19 +169,15 @@ private string prepareScrollAssignments() ...@@ -140,19 +169,15 @@ private string prepareScrollAssignments()
for (int i = 0; i < ParameterDisplays.Count; i++) for (int i = 0; i < ParameterDisplays.Count; i++)
{ {
//Todo: Adjust due to new Server-Format
List<System.Object> listEntry = new List<System.Object>(); List<System.Object> listEntry = new List<System.Object>();
tempFact = ParameterDisplays[i].GetComponentInChildren<DropHandling>().currentFact; tempFact = ParameterDisplays[i].GetComponentInChildren<DropHandling>().currentFact;
if (tempFact != null) if (tempFact != null)
{ {
listEntry.Add(new JSONManager.URI(this.scroll.requiredFacts[i].@ref.uri)); listEntry.Add(new JSONManager.URI(this.scroll.requiredFacts[i].@ref.uri));
listEntry.Add(new JSONManager.OMS(tempFact.backendURI)); listEntry.Add(new JSONManager.OMS(tempFact.backendURI));
assignmentList.Add(listEntry);
} }
else
{
listEntry.Add(new JSONManager.URI(this.scroll.requiredFacts[i].@ref.uri));
listEntry.Add(null);
}
assignmentList.Add(listEntry);
} }
Scroll.FilledScroll filledScroll = new Scroll.FilledScroll(this.scroll.@ref, assignmentList); Scroll.FilledScroll filledScroll = new Scroll.FilledScroll(this.scroll.@ref, assignmentList);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment