Merge branch 'main' into texture-array-updates

playcanvas · Jul 9, 2024 · 43c5e2a · 43c5e2a
2 parents 50cbd9b + 18aee53
commit 43c5e2a
Show file tree

Hide file tree

Showing 290 changed files with 3,423 additions and 3,508 deletions.
diff --git a/examples/src/examples/graphics/integer-textures.example.mjs b/examples/src/examples/graphics/integer-textures.example.mjs
@@ -232,6 +232,7 @@ assetListLoader.load(() => {
     const gameScreenMaterial = gameScreen.render.material;
     gameScreenMaterial.diffuse = pc.Color.BLACK;
     gameScreenMaterial.emissiveMap = outputTexture;
+    gameScreenMaterial.emissive = pc.Color.WHITE;
     gameScreenMaterial.useLighting = false;
     gameScreenMaterial.update();
     app.root.addChild(gameScreen);

diff --git a/examples/src/examples/graphics/mesh-decals.example.mjs b/examples/src/examples/graphics/mesh-decals.example.mjs
@@ -200,6 +200,7 @@ assetListLoader.load(() => {
     material.blendType = pc.BLEND_ADDITIVEALPHA; // additive alpha blend
     material.depthWrite = false; // optimization - no need to write to depth buffer, as decals are part of the ground plane
     material.emissiveMap = assets.heart.resource;
+    material.emissive = pc.Color.WHITE;
     material.opacityMap = assets.heart.resource;
     material.depthBias = -0.1; // depth biases to avoid z-fighting with ground plane
     material.slopeDepthBias = -0.1;

diff --git a/examples/src/examples/graphics/painter.example.mjs b/examples/src/examples/graphics/painter.example.mjs
@@ -54,7 +54,7 @@ app.on('destroy', () => {
  */
 function createPrimitive(primitiveType, position, scale, layer, material) {
     // create primitive
-    const primitive = new pc.Entity();
+    const primitive = new pc.Entity(`Brush-${primitiveType}`);
     primitive.addComponent('render', {
         type: primitiveType,
         layers: layer,
@@ -91,7 +91,6 @@ app.scene.layers.insert(paintLayer, 0);
 
 // create a material we use for the paint brush - it uses emissive color to control its color, which is assigned later
 const brushMaterial = new pc.StandardMaterial();
-brushMaterial.emissiveTint = true;
 brushMaterial.useLighting = false;
 brushMaterial.update();
 
@@ -141,7 +140,9 @@ app.root.addChild(camera);
 
 // material used to add render target into the world
 const material = new pc.StandardMaterial();
+material.name = 'EmissiveMaterial';
 material.emissiveMap = texture;
+material.emissive = pc.Color.WHITE;
 material.useLighting = false;
 material.update();
 

diff --git a/examples/src/examples/graphics/reflection-box.example.mjs b/examples/src/examples/graphics/reflection-box.example.mjs
@@ -162,6 +162,7 @@ assetListLoader.load(() => {
     const screenMaterial = new pc.StandardMaterial();
     screenMaterial.useLighting = false;
     screenMaterial.emissiveMap = videoTexture;
+    screenMaterial.emissive = pc.Color.WHITE;
     screenMaterial.update();
 
     /**

diff --git a/examples/src/examples/graphics/render-to-texture.example.mjs b/examples/src/examples/graphics/render-to-texture.example.mjs
@@ -247,9 +247,11 @@ assetListLoader.load(() => {
     tv.setLocalEulerAngles(90, 0, 0);
     tv.render.castShadows = false;
     tv.render.receiveShadows = false;
+
     /** @type {pc.StandardMaterial} */
     const material = tv.render.material;
     material.emissiveMap = texture; // assign the rendered texture as an emissive texture
+    material.emissive = pc.Color.WHITE;
     material.update();
 
     // setup skydome, use top mipmap level of cubemap (full resolution)

diff --git a/examples/src/examples/graphics/texture-basis.example.mjs b/examples/src/examples/graphics/texture-basis.example.mjs
@@ -78,7 +78,6 @@ assetListLoader.load(() => {
     // Construct material
     const material = new pc.StandardMaterial();
     material.useMetalness = true;
-    material.diffuse = new pc.Color(0.3, 0.3, 0.3);
     material.gloss = 0.8;
     material.metalness = 0.7;
     material.diffuseMap = assets.color.resource;

diff --git a/examples/src/examples/graphics/video-texture.example.mjs b/examples/src/examples/graphics/video-texture.example.mjs
@@ -114,6 +114,7 @@ assetListLoader.load(() => {
     const material = new pc.StandardMaterial();
     material.useLighting = false;
     material.emissiveMap = videoTexture;
+    material.emissive = pc.Color.WHITE;
     material.update();
 
     // set the material on the screen mesh

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,8 +77,9 @@
         "error",
         {
           "definedTags": [
+            "attribute",
             "category",
-            "attribute"
+            "import"
           ]
         }
       ]
@@ -132,9 +133,9 @@
     "rollup-plugin-visualizer": "^5.12.0",
     "serve": "^14.2.2",
     "sinon": "^17.0.1",
-    "typedoc": "^0.25.13",
-    "typedoc-plugin-mdn-links": "^3.1.22",
-    "typescript": "^5.4.5",
+    "typedoc": "^0.26.3",
+    "typedoc-plugin-mdn-links": "^3.2.2",
+    "typescript": "^5.5.3",
     "xhr2": "^0.2.1"
   },
   "scripts": {