Real/currents

.gitignore

@@ -1,2 +1,3 @@
+.idea
 .DS_Store
-/node_modules
+node_modules

abstract/Texture.mjs

@@ -25,6 +25,7 @@ class TextureInstance {
 
 	bind(gl, texture, data) {
 		gl.bindTexture(constants.TEXTURE_2D, this._);
+		gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
 
 		if (ArrayBuffer.isView(data)) {
 			// TODO figure out where this goes
@@ -35,13 +36,13 @@ class TextureInstance {
 		} else {
 			gl.texImage2D(constants.TEXTURE_2D, 0, constants.RGBA, constants.RGBA, constants.UNSIGNED_BYTE, data);
 		}
-
+
+		gl.generateMipmap(constants.TEXTURE_2D);
+
 		const width  = 'naturalWidth'  in data ? data.naturalWidth  : data.width;
 		const height = 'naturalHeight' in data ? data.naturalHeight : data.height;
 
 		if (is_power_of_two(width) && is_power_of_two(height)) {
-			gl.generateMipmap(constants.TEXTURE_2D);
-
 			gl.texParameteri(constants.TEXTURE_2D, constants.TEXTURE_WRAP_S, texture.opts.wrapS);
 			gl.texParameteri(constants.TEXTURE_2D, constants.TEXTURE_WRAP_T, texture.opts.wrapT);
 			gl.texParameteri(constants.TEXTURE_2D, constants.TEXTURE_MIN_FILTER, texture.opts.minFilter);
@@ -92,4 +93,4 @@ export default class Texture {
 		if (!b.has(this.hash)) b.set(this.hash, new TextureInstance(scene, this, index));
 		return b.get(this.hash);
 	}
-}
+}

controls/OrbitControls.svelte

@@ -8,7 +8,7 @@
 	// TODO check we're not inside a group?
 	const scene = get_scene();
 
-	export let location = new Float32Array([1, 3, 5]);
+	export let location = new Float32Array([1, 3, 1]);
 	export let target = new Float32Array([0, 1, 0]);
 	// export let up = new Float32Array([0, 1, 0]);
 
@@ -275,4 +275,4 @@
 	});
 </script>
 
-<slot {location} {target}></slot>
+<slot {location} {target}></slot>

geometry/Geometry.mjs

@@ -15,20 +15,25 @@ class GeometryInstance {
 			const attribute = attributes[key];
 
 			this.locations[key] = gl.getAttribLocation(program, key);
+			if (this.primitive === 'POINTS') console.log(key, ":", attribute);
 
 			const buffer = gl.createBuffer();
-			this.buffers[key] = buffer;
 
 			gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
 			gl.bufferData(gl.ARRAY_BUFFER, attribute.data, attribute.dynamic ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW);
+			this.buffers[key] = buffer;
 		}
 
 		if (index) {
 			const buffer = gl.createBuffer();
-			this.buffers.__index = buffer;
 			gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, buffer);
 			gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, index, gl.STATIC_DRAW);
+			this.buffers.__index = buffer;
 		}
+
+		// Un-bind buffers
+		gl.bindBuffer(gl.ARRAY_BUFFER, null);
+		gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
 	}
 
 	set_attributes(gl) {
@@ -48,6 +53,8 @@ class GeometryInstance {
 
 			// Bind the position buffer.
 			const buffer = this.buffers[key];
+
+			// if (this.primitive = 'POINTS') console.log("enableVertexAttribArray on location ", key);
 
 			gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
 
@@ -131,4 +138,4 @@ function get_count(attributes) {
 	}
 
 	return min;
-}
+}