Merge branch 'more-ui-objects' into 'master'

More ui objects

See merge request pedrotrschneider/project-edu!4

index.html

@@ -39,6 +39,8 @@
       <script type="text/javascript" src="pandora/game_objects/ui_objects/CheckBox.js"></script>
       <script type="text/javascript" src="pandora/game_objects/ui_objects/Select.js"></script>
       <script type="text/javascript" src="pandora/game_objects/ui_objects/Radio.js"></script>
+      <script type="text/javascript" src="pandora/game_objects/ui_objects/ColorPicker.js"></script>
+      <script type="text/javascript" src="pandora/game_objects/ui_objects/Input.js"></script>
 
     <!-- Handlers -->
     <script type="text/javascript" src="pandora/handlers/GameHandler.js"></script>

pandora/game_objects/ui_objects/ColorPicker.js

@@ -0,0 +1,18 @@
+class ColorPicker extends UIObject
+{
+    constructor(name, color = "#FFFFFF")
+    {
+        super(name);
+
+        this.P5Element = createColorPicker(color);
+        this.setPosition(0, 0);
+        this.setStyle(DEFAULT_STYLE);
+
+        this.connectCallbacks();
+    }
+
+    getColor()
+    {
+        return this.P5Element.color();
+    }
+}

pandora/game_objects/ui_objects/Input.js

@@ -0,0 +1,24 @@
+class Input extends UIObject
+{
+    constructor(name, value = "", type = "text")
+    {
+        super(name);
+
+        this.P5Element = createInput(value, type);
+        this.setPosition(0, 0);
+        this.setStyle(DEFAULT_STYLE);
+
+        this.connectCallbacks();
+        this.P5Element.input(this.onInput);
+    }
+
+    _onInput()
+    {
+
+    }
+
+    onInput()
+    {
+        this.pandoraObject._onInput();
+    }
+}

src/sketch.js

@@ -14,8 +14,8 @@ function setup()
     GameHandler.init();
     textFont(AssetHandler.getP5FontByName("Lato"));
 
-    test = new Sprite2D("mySprite", AssetHandler.getP5ImageByName("monke"));
-    GameHandler.addRootObject(test);
+    test2 = new Input("myInput", "", "text");
+    GameHandler.addRootObject(test2);
 }
 
 function draw()
@@ -23,9 +23,4 @@ function draw()
     background(220);
     GameHandler.update();
     GameHandler.draw();
-}
-
-function windowResized()
-{
-    resizeCanvas(windowWidth, windowHeight);
 }