Merge branch 'dev-2.0' into fix/filter-size

perminder-17 · web-flow · commit 597bc467a4a9 · 2025-10-24T02:26:55.000+05:30
diff --git a/package.json b/package.json
@@ -82,6 +82,7 @@
     "./core": {
       "default": "./dist/core/main.js"
     },
+    "./color": "./dist/color/index.js",
     "./shape": "./dist/shape/index.js",
     "./accessibility": "./dist/accessibility/index.js",
     "./friendlyErrors": "./dist/core/friendlyErrors/index.js",
diff --git a/src/core/p5.Renderer2D.js b/src/core/p5.Renderer2D.js
@@ -70,14 +70,18 @@ class Renderer2D extends Renderer {
     }
     this.scale(this._pixelDensity, this._pixelDensity);
 
-    if(!this.filterRenderer){
-      this.filterRenderer = new FilterRenderer2D(this);
-    }
     // Set and return p5.Element
     this.wrappedElt = new Element(this.elt, this._pInst);
     this.clipPath = null;
   }
 
+  get filterRenderer() {
+    if (!this._filterRenderer) {
+      this._filterRenderer = new FilterRenderer2D(this);
+    }
+    return this._filterRenderer;
+  }
+
   remove(){
     this.wrappedElt.remove();
     this.wrappedElt = null;
diff --git a/test/manual-test-examples/async/loadJSON_callback/sketch.js b/test/manual-test-examples/async/loadJSON_callback/sketch.js
@@ -36,9 +36,8 @@ function getWeather() {
 
   var cityName = userInput.value();
   var URL =
-    'http://api.openweathermap.org/data/2.5/weather?q=' +
-    cityName +
-    '&units=metric';
+    'https://wttr.in/' + encodeURIComponent(cityName) + '?format=j1';
+
   result = loadJSON(URL, displayWeather); // displayWeather is the callback
 }
 
@@ -47,9 +46,9 @@ function displayWeather() {
   print(result); // result is ready!
 
   var location = result.name;
-  var currentTemp = result.main.temp;
+  var avgTemp = result.weather[0].avgtempC;
   text(
-    'Current temperature in ' + location + ' is ' + currentTemp + ' celsius',
+    'Today\'s average temperature in ' + location + ' is ' + avgTemp + ' celsius',
     width / 2,
     height / 2
   );
diff --git a/test/manual-test-examples/async/loadJSON_options/sketch.js b/test/manual-test-examples/async/loadJSON_options/sketch.js
@@ -1,7 +1,7 @@
 function setup() {
   noCanvas();
   loadJSON(
-    'http://api.openweathermap.org/data/2.5/station?id=5091',
+    'https://wttr.in/Berlin?format=j1',
     parseStuff,
     'json'
   );
diff --git a/test/manual-test-examples/async/loadJSON_preload/sketch.js b/test/manual-test-examples/async/loadJSON_preload/sketch.js
@@ -1,5 +1,5 @@
 // In this example, we want to load JSON (a JavaScript Object)
-// from a URL at openweathermap.org, and display it in setup().
+// from a URL at wttr.in, and display it in setup().
 //
 // Since setup() happens faster than you can load a website, the
 // data does not have time to properly load before setup() is done.
@@ -13,7 +13,7 @@ var result;
 
 function preload() {
   result = loadJSON(
-    'http://api.openweathermap.org/data/2.5/weather?id=5128581&units=imperial'
+    'https://wttr.in/Berlin?format=j1'
   );
   console.log('In preload(), the result has not finished loading: ');
   console.log(result);
@@ -29,10 +29,10 @@ function setup() {
   console.log('In setup(), here is the result: ');
   console.log(result);
 
-  var location = result.name;
-  var currentTemp = result.main.temp;
+  var location = result.nearest_area[0].areaName[0].value;
+  var avgTemp = result.weather[0].avgtempC;
   text(
-    'Current temperature in ' + location + ' is ' + currentTemp + 'F',
+    'Today\'s average temperature in ' + location + ' is ' + avgTemp + ' celsius',
     width / 2,
     height / 2
   );
diff --git a/test/manual-test-examples/dom/radio_test/sketch.js b/test/manual-test-examples/dom/radio_test/sketch.js
@@ -5,13 +5,13 @@ function setup() {
   radio.id('test');
   //radio = createSelect(); // for comparison
 
-  // just mucking around
+  // The first is the value; the second is the optional label
   radio.option('apple', '1');
   radio.option('orange', '2');
   radio.option('pear');
 
   // Set what it starts as
-  radio.selected('2');
+  radio.selected('orange');
 
   radio.changed(mySelectEvent);
 }
@@ -24,7 +24,7 @@ function draw() {
 }
 
 function mySelectEvent() {
-  var selected = this.selected();
+  var selected = this.selected().value;
   console.log(this.value());
   if (selected === 'pear') {
     console.log("it's a pear!");
diff --git a/test/manual-test-examples/keyboard/keyIsPressed.html b/test/manual-test-examples/keyboard/keyIsPressed.html
@@ -6,5 +6,6 @@
   </head>
 
   <body>
+    <p>Press the arrow keys, colors should change.</p>
   </body>
 </html>

-Original file line number
+Diff line change
   </head>
   <body>
 +    <p>Press the arrow keys, colors should change.</p>
   </body>
 </html>