Merge branch 'S1P4_Develop' into main

Author: Kersoph

Lessons/1/User/ThreeStar.sfc

@@ -0,0 +1,54 @@
+using Godot;
+
+
+namespace Osls.Bubbles
+{
+    public class BubbleSprite : Sprite3D
+    {
+        #region ==================== Fields / Properties ====================
+        public enum Bubble { Say, Think, Shout, None }
+        public enum Expression { Attention, Exclamation, Confused, Surprised, Ok, Nok, Sleeping, Annoyed, Angry, Frustrated, Loving, Happy, Sad, Laughing, Busy, Depressed, Dizzy, Home, Idea, Money, Music, Waiting }
+        
+        private const int LineOffset = 4;
+        private float _remainingTime;
+        private bool _importantDisplay;
+        
+        /// <summary>
+        /// Cumulated time in s from the last activation
+        /// </summary>
+        public float TimeSinceLastActivation { get; private set; }
+        #endregion
+        
+        
+        #region ==================== Public Methods ====================
+        /// <summary>
+        /// Shows the 3dSprite with the bubble type and expression for the given time [s] and then hides again.
+        /// </summary>
+        public void ShowAs(Bubble bubble, Expression expression, float time, bool important = false)
+        {
+            if (_importantDisplay && ! important) return;
+            _importantDisplay = important;
+            int y = (int)bubble * LineOffset + (int)expression / Hframes;
+            int x = (int)expression % Hframes;
+            FrameCoords = new Vector2(x, y);
+            _remainingTime = time;
+            TimeSinceLastActivation = 0;
+            Visible = true;
+        }
+        
+        public override void _Process(float delta)
+        {
+            if (Visible)
+            {
+                _remainingTime -= delta;
+                if (_remainingTime < 0)
+                {
+                    Visible = false;
+                    _importantDisplay = false;
+                }
+            }
+            TimeSinceLastActivation += delta;
+        }
+        #endregion
+    }
+}

Lessons/1/User/TwoStar.sfc

@@ -0,0 +1,15 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://data/core/bubbles/import/BubblesT.png" type="Texture" id=1]
+[ext_resource path="res://data/core/bubbles/BubbleSprite.cs" type="Script" id=2]
+
+[node name="BubbleSprite" type="Sprite3D"]
+modulate = Color( 0.862745, 0.862745, 0.862745, 1 )
+pixel_size = 0.04
+billboard = 2
+double_sided = false
+alpha_cut = 1
+texture = ExtResource( 1 )
+hframes = 16
+vframes = 16
+script = ExtResource( 2 )

Lessons/3/User/Diagram_Full.sfc

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/BubblesT.png-eb137043f305b448b3226ace9a24a9bc.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://data/core/bubbles/import/BubblesT.png"
+dest_files=[ "res://.import/BubblesT.png-eb137043f305b448b3226ace9a24a9bc.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=2
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=true
+flags/anisotropic=true
+flags/srgb=1
+process/fix_alpha_border=false
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Lessons/3/User/Diagram_Sensor.sfc

@@ -9,7 +9,7 @@ public static string LessonsFolderPath
         {
             get
             {
-                return Godot.ProjectSettings.GlobalizePath("res://Lessons/");
+                return Godot.ProjectSettings.GlobalizePath("res://lessons/");
             }
         }
     }