Merge branch 'master' of github.com:openframeworks/openFrameworks

Author: ofTheo

.github/workflows/manual-web-examples.yml

@@ -0,0 +1,48 @@
+name: build-web-examples
+
+
+# make the action not run on the local repo if the branch is also in a pull request to OF/OF
+#on: 
+#  workflow_dispatch:
+#    inputs:
+#          release:
+#            description: 'release'     
+#            required: true
+#            default: 'nightly'
+on:
+  push:
+    if: github.event_name == 'push' && github.event.pull_request == null
+    paths-ignore:
+    - '**/*.md'
+    - 'examples/**'
+  pull_request:
+    if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
+    paths-ignore:
+      - '**/*.md'
+      - 'examples/**'
+jobs:
+  build-web-examples:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        cfg:
+          - target: emscripten
+    env:
+      TARGET: ${{matrix.cfg.target}}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Docker Step
+        run:  docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash
+      - name: Download libs
+        run: ./scripts/$TARGET/download_libs.sh
+      - name: Install dependencies
+        run: ./scripts/ci/$TARGET/install_web_examples.sh
+      - name: Build
+        run: docker exec -e GA_EXAMPLES_USER=${{ secrets.SSH_USER }} -e GA_EXAMPLES_SERVER=${{ secrets.SSH_SERVER }} -e GA_EXAMPLES_KEY=${{ secrets.SSH_KEY }} -e GH_HEAD_REF=${{ github.head_ref }} -e GH_BRANCH=${{ github.ref_name }} -e GH_ACTIONS=true -i emscripten sh -c "scripts/ci/$TARGET/examples_to_build.sh"
+        env:
+          GA_EXAMPLES_USER: ${{ secrets.SSH_USER }}
+          GA_EXAMPLES_SERVER: ${{ secrets.SSH_SERVER }}
+          GA_EXAMPLES_KEY: ${{ secrets.SSH_KEY }}
+          GH_HEAD_REF: ${{ github.head_ref }}
+          GH_BRANCH: ${{ github.ref_name }}
+          GH_ACTIONS: "true"

libs/openFrameworks/3d/ofNode.h

@@ -2,8 +2,8 @@
 #pragma once
 
 #include "ofParameter.h"
-// FIXME: deprecated and ctor
-#include "ofConstants.h"
+
+#define GLM_FORCE_CTOR_INIT
 #include "glm/mat4x4.hpp"
 #include <glm/gtc/quaternion.hpp>
 #include <array>
@@ -100,9 +100,15 @@ class ofNode {
 	/// \returns A normalized 3D vector of the node's local y axis direction.
 	glm::vec3 getUpDir() const;
 
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", float getPitch() const);
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", float getHeading() const);
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", float getRoll() const);
+	
+	[[deprecated ("Use Deg/Rad versions.")]]
+	float getPitch() const;
+
+	[[deprecated ("Use Deg/Rad versions.")]]
+	float getHeading() const;
+
+	[[deprecated ("Use Deg/Rad versions.")]]
+	float getRoll() const;
 
 	/// \brief Get pitch of node, aka the rotation along local x axis.
 	/// \returns The rotation around the local x axis in degrees, as a float.
@@ -131,8 +137,9 @@ class ofNode {
 	/// \brief Get the local orientation of the node as a quaternion.
 	/// \returns A quaternion of local orientation (useful for complex rotations)
 	glm::quat getOrientationQuat() const;
-	
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", glm::vec3 getOrientationEuler() const);
+
+	[[deprecated ("Use Deg/Rad versions.")]]
+	glm::vec3 getOrientationEuler() const;
 
 	/// \brief Get local orientation of node in degrees around x, y, and z axes.
 	/// \returns The local x, y and z axes orientation in degrees, as a 3D vector.
@@ -298,7 +305,8 @@ class ofNode {
 	/// \param amount Desired relative position change along local z axis as float.
 	void dolly(float amount);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void tilt(float degrees));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void tilt(float degrees);
 
 	/// \brief Tilt up+down relative to current orientation (around local x axis).
 	///
@@ -310,7 +318,8 @@ class ofNode {
 	/// \param radians Desired relative rotation change along local x axis in radians as float.
 	void tiltRad(float radians);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void pan(float degrees));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void pan(float degrees);
 
 	/// \brief Rotate left+right relative to current orientation (around local y axis).
 	///
@@ -322,7 +331,8 @@ class ofNode {
 	/// \param radians Desired relative rotation change along local y axis in radians as float.
 	void panRad(float radians);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void roll(float degrees));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void roll(float degrees);
 
 	/// \brief Roll left+right relative to current orientation (around local z axis).
 	///
@@ -339,7 +349,8 @@ class ofNode {
 	/// \param q Desired relative rotation change as a ref to quaternion.
 	void rotate(const glm::quat& q);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void rotate(float degrees, const glm::vec3& v));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void rotate(float degrees, const glm::vec3& v);
 
 	/// \brief Rotate relative to current orientation around arbitrary axis.
 	///
@@ -353,7 +364,8 @@ class ofNode {
 	/// \param v Desired axis to rotate around as a ref to cartesian 3D Vector.
 	void rotateRad(float radians, const glm::vec3& v);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void rotate(float degrees, float vx, float vy, float vz));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void rotate(float degrees, float vx, float vy, float vz);
 
 	/// \brief Rotate relative to current orientation around arbitrary axis.
 	///
@@ -377,7 +389,8 @@ class ofNode {
 	/// \param point Point to rotate around in local xyz coordinates as ref to 3D vector.	
 	void rotateAround(const glm::quat& q, const glm::vec3& point);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void rotateAround(float degrees, const glm::vec3& axis, const glm::vec3& point));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void rotateAround(float degrees, const glm::vec3& axis, const glm::vec3& point);
 
 	/// \brief Rotate relative to current orientation around arbitrary axis around point.
 	///
@@ -417,8 +430,11 @@ class ofNode {
 	/// \param upVector The desired up axis as a ref to cartesian 3D vector.
 	void lookAt(const ofNode& lookAtNode, const glm::vec3& upVector);
 
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void orbit(float longitude, float latitude, float radius, const glm::vec3& centerPoint = glm::vec3(0, 0, 0)));
-	OF_DEPRECATED_MSG("Use the Deg/Rad version.", void orbit(float longitude, float latitude, float radius, ofNode& centerNode));
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void orbit(float longitude, float latitude, float radius, const glm::vec3& centerPoint = glm::vec3(0, 0, 0));
+	
+	[[deprecated ("Use Deg/Rad versions.")]]
+	void orbit(float longitude, float latitude, float radius, ofNode& centerNode);
 
 	/// \brief Orbit node around a global position at a specific radius.
 	///

libs/openFrameworks/events/ofEvent.h

@@ -15,9 +15,6 @@
 #include <iostream>
 #include <array>
 
-// FIXME: constants deprecated only
-#include "ofConstants.h"
-
 
 /*! \cond PRIVATE */
 namespace of{
@@ -421,7 +418,8 @@ class ofEventListeners{
 		listeners.emplace_back(std::move(listener));
 	}
 
-	OF_DEPRECATED_MSG("Don't use this method. If you need granular control over each listener, then use individual ofEventListener instances for each.", void unsubscribe(std::size_t pos));
+	[[deprecated("Don't use this method. If you need granular control over each listener, then use individual ofEventListener instances for each.")]]
+	void unsubscribe(std::size_t pos);
 
 	void unsubscribeAll(){
 		listeners.clear();

libs/openFrameworks/gl/ofLight.cpp

@@ -13,8 +13,8 @@
 #include "of3dUtils.h"
 #include "ofGLBaseTypes.h"
 #include "ofGLUtils.h"
-#include "ofConstants.h"
 #include "ofColor.h"
+#define GLM_FORCE_CTOR_INIT
 #include <glm/gtc/quaternion.hpp>
 #include <map>
 

libs/openFrameworks/gl/ofMaterial.h

@@ -2,9 +2,8 @@
 
 #include "ofMaterialBaseTypes.h"
 #include "ofShader.h"
-// FIXME: constants deprecated only and ctor
-#include "ofConstants.h"
 
+#define GLM_FORCE_CTOR_INIT
 #include "glm/fwd.hpp"
 #include "glm/vec2.hpp"
 #include <map>
@@ -344,11 +343,13 @@ class ofMaterial : public ofBaseMaterial {
 	float getNormalGeomToNormalMapMix() const;
 
 	typedef ofMaterialSettings Data;
-	OF_DEPRECATED_MSG("Use getSettings() instead", Data getData() const);
+	[[deprecated("Use getSettings() instead")]]
+	Data getData() const;
 	ofMaterialSettings getSettings() const;
 
 	/// \brief set the material color properties data struct
-	OF_DEPRECATED_MSG("Use setup(settings) instead", void setData(const ofMaterial::Data & data));
+	[[deprecated("Use setup(settings) instead")]]
+	void setData(const ofMaterial::Data & data);
 
 	// documented in ofBaseMaterial
 	void begin() const;

libs/openFrameworks/gl/ofShader.h

@@ -7,6 +7,7 @@
  make sure to catch and report that error.
  */
 
+// FIXME: Targets CTOR
 #include "ofConstants.h"
 #include "glm/fwd.hpp"
 #include <unordered_map>

libs/openFrameworks/gl/ofShadow.cpp

@@ -11,6 +11,7 @@
 #include "ofGLUtils.h"
 #include "ofLight.h"
 #include "ofGLProgrammableRenderer.h"
+// FIXME: Targets
 #include "ofConstants.h"
 
 #define GLM_FORCE_CTOR_INIT

libs/openFrameworks/graphics/ofPath.h

@@ -3,6 +3,7 @@
 #include "ofPolyline.h"
 #include "ofVboMesh.h"
 #include "ofTessellator.h"
+// FIXME: deprecated and targets
 #include "ofConstants.h"
 
 template<typename T>

libs/openFrameworks/graphics/ofPixels.h

@@ -3,7 +3,6 @@
 #include "ofUtils.h"
 #include "ofLog.h"
 #include "ofMath.h"
-#include "ofConstants.h"
 
 template<typename T>
 class ofColor_;
@@ -315,8 +314,12 @@ class ofPixels_ {
 	/// \returns A raw pointer to the pixel data.
 	PixelType * getData();
 	const PixelType * getData() const;
-	OF_DEPRECATED_MSG("Use getData instead",PixelType * getPixels());
-	OF_DEPRECATED_MSG("Use getData instead",const PixelType * getPixels() const);
+
+	[[deprecated("Use getData instead")]]
+	PixelType * getPixels();
+
+	[[deprecated("Use getData instead")]]
+	const PixelType * getPixels() const;
 
 	/// \brief Get the pixel index at a x,y position
 	///

libs/openFrameworks/graphics/ofPolyline.h

@@ -3,9 +3,10 @@
 #ifndef OF_POLYLINE_H
 #define OF_POLYLINE_H
 
-#include "ofConstants.h"
+#define GLM_FORCE_CTOR_INIT
 #include "glm/fwd.hpp"
 #include <deque>
+#include <vector>
 
 /// \file
 /// ofPolyLine allows you to combine multiple points into a single vector data
@@ -367,13 +368,15 @@ class ofPolyline_ {
 
 	void rotateDeg(float degrees, const glm::vec3& axis);
 	void rotateRad(float radians, const glm::vec3& axis);
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", void rotate(float degrees, const glm::vec3& axis));
+	[[deprecated("Use Deg/Rad versions.")]]
+	void rotate(float degrees, const glm::vec3& axis);
 
 	void translate(const glm::vec3 & p);
 
 	void rotateDeg(float degrees, const glm::vec2& axis);
 	void rotateRad(float radians, const glm::vec2& axis);
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", void rotate(float degrees, const glm::vec2& axis));
+	[[deprecated("Use Deg/Rad versions.")]]
+	void rotate(float degrees, const glm::vec2& axis);
 
 	void translate(const glm::vec2 & p);
 
@@ -471,11 +474,13 @@ class ofPolyline_ {
 	T getPointAtIndexInterpolated(float findex) const;
 
 	/// \brief Get angle (degrees) of the path at index
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", float getAngleAtIndex(int index) const);
+	[[deprecated("Use Deg/Rad versions.")]]
+	float getAngleAtIndex(int index) const;
 
 	/// \brief Get angle (degrees) at interpolated index (interpolated between
 	/// neighboring indices)
-	OF_DEPRECATED_MSG("Use Deg/Rad versions.", float getAngleAtIndexInterpolated(float findex) const);
+	[[deprecated("Use Deg/Rad versions.")]]
+	float getAngleAtIndexInterpolated(float findex) const;
 
 	/// \brief Get rotation vector at index (magnitude is sine of angle)
 	T getRotationAtIndex(int index) const;