Lighting

Core/GDCore/Project/Layer.cpp

@@ -13,7 +13,7 @@ namespace gd {
 Camera Layer::badCamera;
 Effect Layer::badEffect;
 
-Layer::Layer() : isVisible(true) {}
+Layer::Layer() : isVisible(true), isLightingLayer(false), followBaseLayerCamera(false) {}
 
 /**
  * Change cameras count, automatically adding/removing them.
@@ -29,6 +29,11 @@ void Layer::SetCameraCount(std::size_t n) {
 void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("visibility", GetVisibility());
+  element.SetAttribute("isLightingLayer", IsLightingLayer());
+  element.SetAttribute("followBaseLayerCamera", IsFollowingBaseLayerCamera());
+  element.SetAttribute("ambientLightColorR", (int)GetAmbientLightColorRed());
+  element.SetAttribute("ambientLightColorG", (int)GetAmbientLightColorGreen());
+  element.SetAttribute("ambientLightColorB", (int)GetAmbientLightColorBlue());
 
   SerializerElement& camerasElement = element.AddChild("cameras");
   camerasElement.ConsiderAsArrayOf("camera");
@@ -61,6 +66,11 @@ void Layer::SerializeTo(SerializerElement& element) const {
 void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
+  SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));
+  SetFollowBaseLayerCamera(element.GetBoolAttribute("followBaseLayerCamera", false));
+  SetAmbientLightColor(element.GetIntAttribute("ambientLightColorR", 128), 
+                       element.GetIntAttribute("ambientLightColorG", 128),
+                       element.GetIntAttribute("ambientLightColorB", 128));
 
   // Compatibility with GD <= 3.3
   if (element.HasChild("Camera")) {

Core/GDCore/Project/Layer.h

@@ -51,6 +51,26 @@ class GD_CORE_API Layer {
    */
   bool GetVisibility() const { return isVisible; }
 
+  /**
+   * \brief Set if the layer is a lightining layer or not.
+   */
+  void SetLightingLayer(bool isLightingLayer_) { isLightingLayer = isLightingLayer_; }
+
+  /**
+   * \brief Return true if the layer is a lighting layer.
+   */
+  bool IsLightingLayer() const { return isLightingLayer; }
+
+  /**
+   * \brief Set if the layer automatically follows the base layer or not.
+   */
+  void SetFollowBaseLayerCamera(bool followBaseLayerCamera_) { followBaseLayerCamera = followBaseLayerCamera_; }
+
+  /**
+   * \brief Return true if the layer follows the base layer.
+   */
+  bool IsFollowingBaseLayerCamera() const { return followBaseLayerCamera; }
+
   /** \name Cameras
    */
   ///@{
@@ -96,6 +116,30 @@ class GD_CORE_API Layer {
 
   ///@}
 
+  /**
+   * Get the ambient light color red component.
+   */
+  unsigned int GetAmbientLightColorRed() const { return ambientLightColorR; }
+
+  /**
+   * Get the ambient light color green component.
+   */
+  unsigned int GetAmbientLightColorGreen() const { return ambientLightColorG; }
+
+  /**
+   * Get the ambient light color blue component.
+   */
+  unsigned int GetAmbientLightColorBlue() const { return ambientLightColorB; }
+
+  /**
+   * Set the ambient light color.
+   */
+  void SetAmbientLightColor(unsigned int r, unsigned int g, unsigned int b) {
+    ambientLightColorR = r;
+    ambientLightColorG = g;
+    ambientLightColorB = b;
+  }
+
   /** \name Effects
    */
   ///@{
@@ -177,6 +221,11 @@ class GD_CORE_API Layer {
  private:
   gd::String name;                  ///< The name of the layer
   bool isVisible;                   ///< True if the layer is visible
+  bool isLightingLayer;             ///< True if the layer is used to display lights and renders an ambient light.
+  bool followBaseLayerCamera;           ///< True if the layer automatically follows the base layer
+  unsigned int ambientLightColorR;     ///< Ambient light color Red component
+  unsigned int ambientLightColorG;     ///< Ambient light color Green component
+  unsigned int ambientLightColorB;     ///< Ambient light color Blue component
   std::vector<gd::Camera> cameras;  ///< The camera displayed by the layer
   std::vector<std::shared_ptr<gd::Effect>>
       effects;  ///< The effects applied to the layer.

Extensions/DraggableBehavior/tests/draggableruntimeautomatism.spec.js

@@ -1,131 +1,160 @@
 // @ts-check
-describe('gdjs.DraggableRuntimeBehavior', function() {
-	var runtimeGame = new gdjs.RuntimeGame({
-		variables: [],
-		resources: {resources: []},
-		// @ts-ignore
-		properties: {windowWidth: 800, windowHeight: 600}
-	});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers:[{name:"", visibility: true, cameras: [], effects: []}],
-		variables: [],
-		r: 0,
-		v: 0,
-		b: 0,
-		mangledName: 'Scene1',
-		name: 'Scene1',
-		stopSoundsOnStartup: false,
-		title: '',
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
-	var object2 = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
-	runtimeScene.addObject(object);
-	runtimeScene.addObject(object2);
-
-	it('should handle mouse', function() {
-		object.setPosition(450, 500);
-
-		//Drag'n'drop
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onMouseMove(450, 500);
-		runtimeGame.getInputManager().onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onMouseMove(750, 600);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
-		runtimeScene.renderAndStep();
-
-		expect(object.getX()).to.be(750);
-		expect(object.getY()).to.be(600);
-
-		//Mouse move with dragging
-		runtimeGame.getInputManager().onMouseMove(600, 600);
-		runtimeScene.renderAndStep();
-
-		expect(object.getX()).to.be(750);
-		expect(object.getY()).to.be(600);
-
-		//Start dragging again
-		runtimeGame.getInputManager().onMouseMove(750, 600);
-		runtimeGame.getInputManager().onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onMouseMove(850, 700);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
-		runtimeScene.renderAndStep();
-
-		expect(object.getX()).to.be(850);
-		expect(object.getY()).to.be(700);
-
-	});
-	it('should handle touches', function() {
-		runtimeGame.getInputManager().touchSimulateMouse(false);
-		object.setPosition(450, 500);
-
-		//Drag'n'drop
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchStart(1, 10, 20);
-		runtimeGame.getInputManager().onTouchStart(0, 450, 500);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onFrameEnded();
-		runtimeGame.getInputManager().onTouchMove(0, 750, 600);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onFrameEnded();
-		runtimeGame.getInputManager().onTouchEnd(0);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onFrameEnded();
-
-		expect(object.getX()).to.be(750);
-		expect(object.getY()).to.be(600);
-
-		//Move another unrelated touch
-		runtimeGame.getInputManager().onTouchMove(1, 750, 600);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchMove(1, 850, 700);
-		runtimeScene.renderAndStep();
-
-		expect(object.getX()).to.be(750);
-		expect(object.getY()).to.be(600);
-
-		//Start drag'n'drop with another touch
-		runtimeGame.getInputManager().onTouchEnd(1);
-		runtimeGame.getInputManager().onFrameEnded();
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchStart(1, 750, 600);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchMove(1, 850, 700);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchEnd(1);
-		runtimeGame.getInputManager().onFrameEnded();
-
-		expect(object.getX()).to.be(850);
-		expect(object.getY()).to.be(700);
-	});
-	it('should handle multitouch', function() {
-		runtimeGame.getInputManager().touchSimulateMouse(false);
-		object.setPosition(450, 500);
-		object2.setPosition(650, 600);
-
-		//Drag'n'drop
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onTouchStart(2, 450, 500);
-		runtimeGame.getInputManager().onTouchStart(1, 650, 600);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onFrameEnded();
-		runtimeGame.getInputManager().onTouchMove(2, 750, 700);
-		runtimeGame.getInputManager().onTouchMove(1, 100, 200);
-		runtimeScene.renderAndStep();
-		runtimeGame.getInputManager().onFrameEnded();
-		runtimeGame.getInputManager().onTouchEnd(2);
-
-		expect(object.getX()).to.be(750);
-		expect(object.getY()).to.be(700);
-		expect(object2.getX()).to.be(100);
-		expect(object2.getY()).to.be(200);
-	});
+describe('gdjs.DraggableRuntimeBehavior', function () {
+  var runtimeGame = new gdjs.RuntimeGame({
+    variables: [],
+    resources: { resources: [] },
+    // @ts-ignore
+    properties: { windowWidth: 800, windowHeight: 600 },
+  });
+  var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+  runtimeScene.loadFromScene({
+    layers: [
+      {
+        name: '',
+        visibility: true,
+        cameras: [],
+        effects: [],
+        ambientLightColorR: 127,
+        ambientLightColorB: 127,
+        ambientLightColorG: 127,
+        isLightingLayer: false,
+        followBaseLayerCamera: false,
+      },
+    ],
+    variables: [],
+    r: 0,
+    v: 0,
+    b: 0,
+    mangledName: 'Scene1',
+    name: 'Scene1',
+    stopSoundsOnStartup: false,
+    title: '',
+    behaviorsSharedData: [],
+    objects: [],
+    instances: [],
+  });
+
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [{ name: 'Behavior1', type: 'DraggableBehavior::Draggable' }],
+    variables: [],
+  });
+  var object2 = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [{ name: 'Behavior1', type: 'DraggableBehavior::Draggable' }],
+    variables: [],
+  });
+  runtimeScene.addObject(object);
+  runtimeScene.addObject(object2);
+
+  it('should handle mouse', function () {
+    object.setPosition(450, 500);
+
+    //Drag'n'drop
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onMouseMove(450, 500);
+    runtimeGame
+      .getInputManager()
+      .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onMouseMove(750, 600);
+    runtimeScene.renderAndStep();
+    runtimeGame
+      .getInputManager()
+      .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
+    runtimeScene.renderAndStep();
+
+    expect(object.getX()).to.be(750);
+    expect(object.getY()).to.be(600);
+
+    //Mouse move with dragging
+    runtimeGame.getInputManager().onMouseMove(600, 600);
+    runtimeScene.renderAndStep();
+
+    expect(object.getX()).to.be(750);
+    expect(object.getY()).to.be(600);
+
+    //Start dragging again
+    runtimeGame.getInputManager().onMouseMove(750, 600);
+    runtimeGame
+      .getInputManager()
+      .onMouseButtonPressed(gdjs.InputManager.MOUSE_LEFT_BUTTON);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onMouseMove(850, 700);
+    runtimeScene.renderAndStep();
+    runtimeGame
+      .getInputManager()
+      .onMouseButtonReleased(gdjs.InputManager.MOUSE_LEFT_BUTTON);
+    runtimeScene.renderAndStep();
+
+    expect(object.getX()).to.be(850);
+    expect(object.getY()).to.be(700);
+  });
+  it('should handle touches', function () {
+    runtimeGame.getInputManager().touchSimulateMouse(false);
+    object.setPosition(450, 500);
+
+    //Drag'n'drop
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchStart(1, 10, 20);
+    runtimeGame.getInputManager().onTouchStart(0, 450, 500);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onFrameEnded();
+    runtimeGame.getInputManager().onTouchMove(0, 750, 600);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onFrameEnded();
+    runtimeGame.getInputManager().onTouchEnd(0);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onFrameEnded();
+
+    expect(object.getX()).to.be(750);
+    expect(object.getY()).to.be(600);
+
+    //Move another unrelated touch
+    runtimeGame.getInputManager().onTouchMove(1, 750, 600);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchMove(1, 850, 700);
+    runtimeScene.renderAndStep();
+
+    expect(object.getX()).to.be(750);
+    expect(object.getY()).to.be(600);
+
+    //Start drag'n'drop with another touch
+    runtimeGame.getInputManager().onTouchEnd(1);
+    runtimeGame.getInputManager().onFrameEnded();
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchStart(1, 750, 600);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchMove(1, 850, 700);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchEnd(1);
+    runtimeGame.getInputManager().onFrameEnded();
+
+    expect(object.getX()).to.be(850);
+    expect(object.getY()).to.be(700);
+  });
+  it('should handle multitouch', function () {
+    runtimeGame.getInputManager().touchSimulateMouse(false);
+    object.setPosition(450, 500);
+    object2.setPosition(650, 600);
+
+    //Drag'n'drop
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onTouchStart(2, 450, 500);
+    runtimeGame.getInputManager().onTouchStart(1, 650, 600);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onFrameEnded();
+    runtimeGame.getInputManager().onTouchMove(2, 750, 700);
+    runtimeGame.getInputManager().onTouchMove(1, 100, 200);
+    runtimeScene.renderAndStep();
+    runtimeGame.getInputManager().onFrameEnded();
+    runtimeGame.getInputManager().onTouchEnd(2);
+
+    expect(object.getX()).to.be(750);
+    expect(object.getY()).to.be(700);
+    expect(object2.getX()).to.be(100);
+    expect(object2.getY()).to.be(200);
+  });
 });