solve merge conflict

2026-05-02 00:44:43 -05:00 · 2016-05-04 12:10:49 -04:00
parent 05cc0850b7 8fc89d8762
commit 3a80405c30
17 changed files with 264 additions and 140 deletions
@@ -32,6 +32,24 @@ function postInitialization()
    openspace.iswa.addCygnet("-1,Data,1");
    openspace.iswa.addCygnet("-2,Data,1");
    openspace.iswa.addCygnet("-3,Data,1");
+
+    openspace.registerScreenSpaceRenderable(
+    {
+        Type = "ScreenSpaceCygnet",
+        CygnetId = 7,
+        Position = {-0.8, 0.3},
+        FlatScreen = true,
+        Scale = 0.25,
+    });
+
+    openspace.registerScreenSpaceRenderable(
+    {
+        Type = "ScreenSpaceImage",
+        TexturePath = "${OPENSPACE_DATA}/test2.jpg",
+        Position = {0.8, -0.3},
+        FlatScreen = true,
+        Scale = 0.25,
+    });
 end