Added init struct (resource loading helpers)

sunpy/__init__.js

@@ -0,0 +1,4 @@
+// Map
+import "./core/__init__.js";
+import "./node/__init__.js";
+import "./canvas/__init__.js";

sunpy/canvas/__init__.js

@@ -0,0 +1,10 @@
+// Depends
+import "../core/__init__.js";
+import "../node/__init__.js";
+
+// Map
+import "./entity.js";
+import "./helpers.js";
+import "./renderer.js";
+
+import "./gl/texture.js";

sunpy/canvas/entity.js

@@ -0,0 +1,18 @@
+export class Entity {
+    constructor() {}
+    async render(renderNode) {}
+    async update(renderNode) {}
+}
+
+export class Sprite extends Entity {
+    constructor(image) {
+        if (!(image instanceof Image)) 
+            throw TypeError("Image has to be instance of `Image`");
+        
+        this.image = image;
+    }
+
+    async render(renderNode) {
+        
+    }
+}

sunpy/canvas/gl/shaders/texture.fs

@@ -0,0 +1,9 @@
+precision mediump float;
+
+uniform sampler2D u_texture;
+
+varying vec2 v_texcoord;
+
+void main() {
+    gl_FragColor = texture2D(u_texture, v_texcoord);
+}

sunpy/canvas/gl/shaders/texture.vs

@@ -0,0 +1,11 @@
+attribute vec4 position;
+attribute vec2 texcoord;
+
+uniform mat4 u_matrix;
+
+varying vec2 v_texcoord;
+
+void main() {
+    gl_Position = u_matrix * position;
+    v_texcoord = texcoord;
+}

sunpy/canvas/gl/texture.js

@@ -0,0 +1,23 @@
+//const fs = await (await fetch("./shaders/texture.fs")).text();
+
+export async function compile() {
+    /*
+    const fs = await (await fetch("./shaders/texture.fs")).text();
+    const vs = await (await fetch("./shaders/texture.vs")).text();
+    */
+
+    const fs = import("./shaders/texture.fs");
+    const vs = import("./shaders/texture.vs");
+
+    window.fs = fs;
+    window.vs = vs;
+    console.log("done");
+}
+
+export function drawImage(gl, tex, texWidth, texHeight, dstX, dstY) {
+    gl.bindTexture(gl.TEXTURE_2D, tex);
+
+    gl.useProgram(program); // TODO
+
+
+}

sunpy/canvas/renderer.js

@@ -3,6 +3,7 @@ import { PropertyNode } from "../node/nodes/propertynode.js";
 import { PropertyReader, Property } from "../node/propertyreader.js";
 import { sleep } from "../core/utils.js";
 import { Vector } from "../core/vector.js";
+import { Entity } from "./entity.js";
 
 register("canvas", initRenderNode);
 
@@ -31,7 +32,7 @@ export class RenderNode extends PropertyNode {
         this.gl.depthFunc(this.gl.LEQUAL);
 
         this.fps = 0;
-        this.objects = [];
+        this.entities = [];
         this.running = false;
     }
 
@@ -52,11 +53,11 @@ export class RenderNode extends PropertyNode {
         this.running = false;
     }
 
-    add(object) {
+    add(entity) {
-        if (!(object instanceof Renderable))
+        if (!(entity instanceof Entity))
-            throw TypeError("Object must be instance of Renderable");
+            throw TypeError("entity must be instance of `Entity`");
         
-        this.objects.push(object);
+        this.entities.push(entity);
     }
 
     async loop() { // TODO: Fix all variables
@@ -83,22 +84,11 @@ export class RenderNode extends PropertyNode {
     }
 
     async render() {
-
         this.gl.clearColor(0.0, 0.0, 0.0, 1.0);
         this.gl.clear(this.gl.COLOR_BUFFER_BIT | this.gl.DEPTH_BUFFER_BIT);
 
-        for (const object of this.objects) {
+        for (const entity of this.entities) {
-            await object.render(this);
+            await entity.render(this);
         }
     }
 }
-
-export class Renderable {
-    constructor() {
-
-    }
-
-    async render(renderNode) {
-
-    }
-}

sunpy/core/__init__.js

@@ -0,0 +1,3 @@
+// Map
+import "./utils.js"
+import "./vector.js";

sunpy/node/__init__.js

@@ -0,0 +1,7 @@
+// Map
+import "./node.js";
+import "./propertyreader.js";
+
+import "./nodes/basenode.js";
+import "./nodes/swapnode.js";
+import "./nodes/propertynode.js";

sunpy/node/nodes/propertynode.js

@@ -6,7 +6,7 @@ export class PropertyNode extends SwapNode {
         super(node, swapNode);
 
         if (!(propertyReader instanceof PropertyReader))
-            throw TypeError("propertyReader must be an instance of PropertyReader");
+            throw TypeError("propertyReader must be an instance of `PropertyReader`");
 
         this.propertyReader = propertyReader;
 

sunpy/node/nodes/swapnode.js

@@ -5,7 +5,7 @@ export class SwapNode extends BaseNode {
         super(node);
         
         if (!(swapNode instanceof Node))
-            throw TypeError("swapNode must be instance of Node");
+            throw TypeError("swapNode must be instance of `Node`");
 
         this.swapNode = swapNode;
 
@@ -16,6 +16,12 @@ export class SwapNode extends BaseNode {
         if (this.hasReplaceNodes)
             return false;
 
+        // Copy id and classes to new node
+        if (this.node.id)
+            this.swapNode.id = this.node.id;
+        if (this.node.classList.length)
+            this.swapNode.classList = this.node.classList;
+
         this.linker(this.node, this.swapNode);
 
         this.node.parentNode.replaceChild(this.swapNode, this.node);

sunpy/orep/__init__.js

@@ -0,0 +1,2 @@
+// Map
+import "./orep.js";

sunpy/orep/orep.js

@@ -1,13 +1,3 @@
 import { RenderNode } from "../canvas/renderer.js";
-
+import { compile } from "../canvas/gl/texture.js";
-/*
+window.compile = compile;
-var onloadOld = onload || (() => {});
-onload = () => {
-    onloadOld();
-    init();
-}
-
-function init() {
-    
-}
-*/

tests/init.html

@@ -11,7 +11,7 @@
             console.log("TEST - onload defined before module load");
         }
     </script>
-    <script type="module" src="/sunpy/orep/orep.js" async></script>
+    <script type="module" src="/sunpy/__init__.js" async></script>
     <script>
         var onloadPost = onload || (() => {});
         onload = () => {
@@ -21,10 +21,10 @@
     </script>
 </head>
 <body>
-    <script type="orep/canvas">
+    <script type="orep/canvas" class="test" id="render">
         size = 400x300
     </script>
-    <script type="orep/canvas">
+    <script type="orep/canvas" class="test abc" id="stats">
         size = 600x450
     </script>
 </body>

tests/render.html

@@ -4,7 +4,9 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Tests - render</title>
-    <script type="module" src="/sunpy/orep/orep.js" async></script>
+    <script type="module" async>
+        import "../sunpy/__init__.js";
+    </script>
 </head>
 <body>
     <script type="orep/canvas">