@footgun/cobalt 0.6.3 → 0.6.5

package/CHANGELOG.md

@@ -1,16 +1,28 @@
+# 0.6.5
+* add sdl + webgpu support for tile node
+
+
+# 0.6.4
+* add parameters for @kmamal/gpu v0.2.1
+
+
 # 0.6.3
 * add labels to all renderpass nodes
-:
+
+
 # 0.6.2
 * use preferred canvas format in more places
 
+
 # 0.6.1
 * use preferred canvas format in more places
 
+
 # 0.6.0
 * use preferred canvas format in various places instead of hardcoding to bgra8unorm, which doesn't seem to work on linux
   because that defaults to bgra8unorm-srgb
 
+
 # 0.5.1
 * add labels to all render pipelines
 

package/bundle.js

@@ -8222,10 +8222,16 @@ var tile_default = {
   // optional
   customFunctions: {
     setTexture: async function(cobalt, node, textureUrl) {
-      const { device } = cobalt;
+      const { canvas, device } = cobalt;
       destroy3(node);
-      node.options.textureUrl = textureUrl;
-      const material = await createTextureFromUrl(cobalt, "tile map", node.options.textureUrl);
+      const format = getPreferredFormat(cobalt);
+      let material;
+      if (canvas) {
+        node.options.textureUrl = textureUrl;
+        material = await createTextureFromUrl(cobalt, "tile map", node.options.textureUrl, format);
+      } else {
+        material = await createTextureFromBuffer(cobalt, "tile map", node.options.texture, format);
+      }
       const bindGroup = device.createBindGroup({
         layout: node.refs.tileAtlas.data.tileBindGroupLayout,
         entries: [
@@ -14235,8 +14241,14 @@ var atlas_default = {
   }
 };
 async function init10(cobalt, nodeData) {
-  const { device } = cobalt;
-  const atlasMaterial = await createTextureFromUrl(cobalt, "tile atlas", nodeData.options.textureUrl);
+  const { canvas, device } = cobalt;
+  const format = getPreferredFormat(cobalt);
+  let atlasMaterial;
+  if (canvas) {
+    atlasMaterial = await await createTextureFromUrl(cobalt, "tile atlas", nodeData.options.textureUrl, format);
+  } else {
+    atlasMaterial = await await createTextureFromUrl(cobalt, "tile atlas", nodeData.options.texture, format);
+  }
   const uniformBuffer = device.createBuffer({
     size: 32,
     //32 + (16 * 32), // in bytes.  32 for common data + (32 max tile layers * 16 bytes per tile layer)
@@ -14613,9 +14625,11 @@ async function init13(ctx, viewportWidth, viewportHeight) {
   let device, gpu, context, canvas;
   if (ctx.sdlWindow && ctx.gpu) {
     gpu = ctx.gpu;
-    const instance = gpu.create(["verbose=1"]);
+    const instance = gpu.create(["verbose=1", "enable-dawn-features=allow_unsafe_apis"]);
     const adapter = await instance.requestAdapter();
-    device = await adapter.requestDevice();
+    device = await adapter.requestDevice({
+      requiredFeatures: ["texture-component-swizzle"]
+    });
     context = gpu.renderGPUDeviceToWindow({ device, window: ctx.sdlWindow });
     global.GPUBufferUsage = gpu.GPUBufferUsage;
     global.GPUShaderStage = gpu.GPUShaderStage;

package/examples/09-sdl-polar-meters/package.json

@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@kmamal/gpu": "0.2.0",
+    "@kmamal/gpu": "^0.2.0",
     "@kmamal/sdl": "^0.11.7",
     "pngjs": "^7.0.0",
     "wgpu-matrix": "^3.4.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@footgun/cobalt",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "main": "bundle.js",
   "description": "A 2D WebGpu renderer",

package/src/cobalt.js

@@ -31,9 +31,11 @@ export async function init (ctx, viewportWidth, viewportHeight) {
         // this is an sdl/gpu context
         gpu = ctx.gpu
         
-        const instance = gpu.create([ 'verbose=1' ])
+        const instance = gpu.create([ 'verbose=1', 'enable-dawn-features=allow_unsafe_apis' ])
         const adapter = await instance.requestAdapter()
-        device = await adapter.requestDevice()
+        device = await adapter.requestDevice({
+            requiredFeatures: [ 'texture-component-swizzle' ],
+        })
         context = gpu.renderGPUDeviceToWindow({ device, window: ctx.sdlWindow })
 
         // gpu module doesn't expose these globals to node namespace so manually wire them up

package/src/sprite/sprite.js

@@ -260,10 +260,3 @@ function destroy (node) {
     node.data.spriteIndices.clear()
     node.data.spriteIndices = null
 }
-
-
-async function fetchJson (url) {
-    const raw = await fetch(url)
-    return raw.json()
-}
-

package/src/tile/atlas.js

@@ -1,5 +1,7 @@
-import createTextureFromUrl from '../create-texture-from-url.js'
-import tileWGSL             from './tile.wgsl'
+import createTextureFromBuffer from '../create-texture-from-buffer.js'
+import createTextureFromUrl    from '../create-texture-from-url.js'
+import getPreferredFormat      from '../get-preferred-format.js'
+import tileWGSL                from './tile.wgsl'
 
 
 const _buf = new Float32Array(8) //(136)  // tile instance data stored in a UBO
@@ -37,9 +39,20 @@ export default {
 
 
 async function init (cobalt, nodeData) {
-    const { device } = cobalt
+    const { canvas, device } = cobalt
 
-    const atlasMaterial = await createTextureFromUrl(cobalt, 'tile atlas', nodeData.options.textureUrl)
+    const format = getPreferredFormat(cobalt)
+
+    let atlasMaterial
+
+    if (canvas) {
+        // browser (canvas) path
+        atlasMaterial = await await createTextureFromUrl(cobalt, 'tile atlas', nodeData.options.textureUrl, format)
+    }
+    else {
+        // sdl + gpu path
+        atlasMaterial = await await createTextureFromUrl(cobalt, 'tile atlas', nodeData.options.texture, format)
+    }
 
     const uniformBuffer = device.createBuffer({
         size: 32, //32 + (16 * 32), // in bytes.  32 for common data + (32 max tile layers * 16 bytes per tile layer)

package/src/tile/tile.js

@@ -1,4 +1,6 @@
-import createTextureFromUrl from '../create-texture-from-url.js'
+import createTextureFromBuffer from '../create-texture-from-buffer.js'
+import createTextureFromUrl    from '../create-texture-from-url.js'
+import getPreferredFormat      from '../get-preferred-format.js'
 
 
 /*
@@ -47,11 +49,23 @@ export default {
     // optional
     customFunctions: {
         setTexture: async function (cobalt, node, textureUrl) {
-            const { device } = cobalt
+            const { canvas, device } = cobalt
 
             destroy(node)
-            node.options.textureUrl = textureUrl
-            const material = await createTextureFromUrl(cobalt, 'tile map', node.options.textureUrl)
+
+            const format = getPreferredFormat(cobalt)
+
+            let material
+
+            if (canvas) {
+                // browser (canvas) path
+                node.options.textureUrl = textureUrl
+                material = await createTextureFromUrl(cobalt, 'tile map', node.options.textureUrl, format)
+            }
+            else {
+                // sdl + gpu path
+                material = await createTextureFromBuffer(cobalt, 'tile map', node.options.texture, format)
+            }
 
             const bindGroup = device.createBindGroup({
                 layout: node.refs.tileAtlas.data.tileBindGroupLayout,