jmgraph 3.2.16 → 3.2.18

package/src/lib/webgl/core/buffer.js

@@ -1,49 +1,49 @@
-
-// 创建缓冲区
-function createBuffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
-    //先创建一个缓存对象
-    const buffer = gl.createBuffer();
-    if(!buffer) {
-        throw Error('创建缓冲区对象失败');
-    }
-    //说明缓存对象保存的类型
-    gl.bindBuffer(type, buffer);
-    //写入坐标数据
-    // 因为会将数据发送到 GPU，为了省去数据解析，这里使用 Float32Array 直接传送数据
-    // data.buffer这里要使用data.buffer，否则在edge下可能导至数据发生较大的改变
-    gl.bufferData(type, data.buffer || data, drawType); // 表示缓冲区的内容不会经常更改
-    return {
-        type,
-        drawType,
-        buffer,
-        // 获取到数组中单个元素的字节数
-        unitSize: data.BYTES_PER_ELEMENT
-    };
-}
-
-// 创建float32的buffer
-function createFloat32Buffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
-    const vertices = new Float32Array(data);
-    const buffer = createBuffer(gl, vertices, type, drawType);
-    return buffer;
-}
-
-// 创建uint16的bugger
-function createUint16Buffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
-    const vertices = new Uint16Array(data);
-    const buffer = createBuffer(gl, vertices, type, drawType);
-    return buffer;
-}
-
-// 释放
-function deleteBuffer(gl, buffer) {
-    gl.deleteBuffer(buffer.buffer || buffer);
-}
-
-
-export {
-    createBuffer,
-    createUint16Buffer,
-    createFloat32Buffer,
-    deleteBuffer,
+
+// 创建缓冲区
+function createBuffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
+    //先创建一个缓存对象
+    const buffer = gl.createBuffer();
+    if(!buffer) {
+        throw Error('创建缓冲区对象失败');
+    }
+    //说明缓存对象保存的类型
+    gl.bindBuffer(type, buffer);
+    //写入坐标数据
+    // 因为会将数据发送到 GPU，为了省去数据解析，这里使用 Float32Array 直接传送数据
+    // data.buffer这里要使用data.buffer，否则在edge下可能导至数据发生较大的改变
+    gl.bufferData(type, data.buffer || data, drawType); // 表示缓冲区的内容不会经常更改
+    return {
+        type,
+        drawType,
+        buffer,
+        // 获取到数组中单个元素的字节数
+        unitSize: data.BYTES_PER_ELEMENT
+    };
+}
+
+// 创建float32的buffer
+function createFloat32Buffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
+    const vertices = new Float32Array(data);
+    const buffer = createBuffer(gl, vertices, type, drawType);
+    return buffer;
+}
+
+// 创建uint16的bugger
+function createUint16Buffer(gl, data, type=gl.ARRAY_BUFFER, drawType=gl.STATIC_DRAW) {
+    const vertices = new Uint16Array(data);
+    const buffer = createBuffer(gl, vertices, type, drawType);
+    return buffer;
+}
+
+// 释放
+function deleteBuffer(gl, buffer) {
+    gl.deleteBuffer(buffer.buffer || buffer);
+}
+
+
+export {
+    createBuffer,
+    createUint16Buffer,
+    createFloat32Buffer,
+    deleteBuffer,
 }

package/src/lib/webgl/core/mapSize.js

@@ -1,40 +1,40 @@
-
-const GLSL_TO_SIZE = {
-    'float':    1,
-    'vec2':     2,
-    'vec3':     3,
-    'vec4':     4,
-
-    'int':      1,
-    'ivec2':    2,
-    'ivec3':    3,
-    'ivec4':    4,
-
-    'bool':     1,
-    'bvec2':    2,
-    'bvec3':    3,
-    'bvec4':    4,
-
-    'mat2':     4,
-    'mat3':     9,
-    'mat4':     16,
-
-    'sampler2D':  1
-};
-
-/**
- * @class
- * @memberof PIXI.glCore.shader
- * @param type {String}
- * @return {Number}
- */
-const mapSize = function(type) { 
-    return GLSL_TO_SIZE[type];
-};
-
-
-
-
-export {
-    mapSize
-}
+
+const GLSL_TO_SIZE = {
+    'float':    1,
+    'vec2':     2,
+    'vec3':     3,
+    'vec4':     4,
+
+    'int':      1,
+    'ivec2':    2,
+    'ivec3':    3,
+    'ivec4':    4,
+
+    'bool':     1,
+    'bvec2':    2,
+    'bvec3':    3,
+    'bvec4':    4,
+
+    'mat2':     4,
+    'mat3':     9,
+    'mat4':     16,
+
+    'sampler2D':  1
+};
+
+/**
+ * @class
+ * @memberof PIXI.glCore.shader
+ * @param type {String}
+ * @return {Number}
+ */
+const mapSize = function(type) { 
+    return GLSL_TO_SIZE[type];
+};
+
+
+
+
+export {
+    mapSize
+}

package/src/lib/webgl/core/mapType.js

@@ -1,43 +1,43 @@
-
-var GL_TABLE = null;
-
-const GL_TO_GLSL_TYPES = {
-  'FLOAT':       'float',
-  'FLOAT_VEC2':  'vec2',
-  'FLOAT_VEC3':  'vec3',
-  'FLOAT_VEC4':  'vec4',
-
-  'INT':         'int',
-  'INT_VEC2':    'ivec2',
-  'INT_VEC3':    'ivec3',
-  'INT_VEC4':    'ivec4',
-  
-  'BOOL':        'bool',
-  'BOOL_VEC2':   'bvec2',
-  'BOOL_VEC3':   'bvec3',
-  'BOOL_VEC4':   'bvec4',
-  
-  'FLOAT_MAT2':  'mat2',
-  'FLOAT_MAT3':  'mat3',
-  'FLOAT_MAT4':  'mat4',
-  
-  'SAMPLER_2D':  'sampler2D'  
-};
-
-const mapType = function(gl, type) {
-    if(!GL_TABLE) {
-        const typeNames = Object.keys(GL_TO_GLSL_TYPES);
-        GL_TABLE = {};
-        for(let i = 0; i < typeNames.length; ++i) {
-            const tn = typeNames[i];
-            GL_TABLE[ gl[tn] ] = GL_TO_GLSL_TYPES[tn];
-        }
-    }
-
-  return GL_TABLE[type];
-};
-
-
-export {
-  mapType
-}
+
+var GL_TABLE = null;
+
+const GL_TO_GLSL_TYPES = {
+  'FLOAT':       'float',
+  'FLOAT_VEC2':  'vec2',
+  'FLOAT_VEC3':  'vec3',
+  'FLOAT_VEC4':  'vec4',
+
+  'INT':         'int',
+  'INT_VEC2':    'ivec2',
+  'INT_VEC3':    'ivec3',
+  'INT_VEC4':    'ivec4',
+  
+  'BOOL':        'bool',
+  'BOOL_VEC2':   'bvec2',
+  'BOOL_VEC3':   'bvec3',
+  'BOOL_VEC4':   'bvec4',
+  
+  'FLOAT_MAT2':  'mat2',
+  'FLOAT_MAT3':  'mat3',
+  'FLOAT_MAT4':  'mat4',
+  
+  'SAMPLER_2D':  'sampler2D'  
+};
+
+const mapType = function(gl, type) {
+    if(!GL_TABLE) {
+        const typeNames = Object.keys(GL_TO_GLSL_TYPES);
+        GL_TABLE = {};
+        for(let i = 0; i < typeNames.length; ++i) {
+            const tn = typeNames[i];
+            GL_TABLE[ gl[tn] ] = GL_TO_GLSL_TYPES[tn];
+        }
+    }
+
+  return GL_TABLE[type];
+};
+
+
+export {
+  mapType
+}

package/src/lib/webgl/core/program.js

@@ -1,139 +1,139 @@
-import {
-    createShader
-} from './shader.js';
-import {
-    mapSize
-} from './mapSize.js';
-import {
-    mapType
-} from './mapType.js';
-
-// 创建程序
-function createProgram(gl, vertexSrc, fragmentSrc) {
-    // 创建顶点着色器
-    const vertexShader = createShader(gl, gl.VERTEX_SHADER, vertexSrc);
-    // 创建片段着色器
-    const fragmentShader = createShader(gl, gl.FRAGMENT_SHADER, fragmentSrc);
-
-    const program = gl.createProgram() // 创建一个程序
-    gl.attachShader(program, vertexShader) // 添加顶点着色器
-    gl.attachShader(program, fragmentShader) // 添加片元着色器
-    gl.linkProgram(program) // 连接 program 中的着色器
-
-    // 检查程序链接状态
-    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-        console.error('PError: Could not initialize shader.');
-        console.error('gl.VALIDATE_STATUS', gl.getProgramParameter(program, gl.VALIDATE_STATUS));
-        console.error('gl.getError()', gl.getError());
-
-        // if there is a program info log, log it
-        if (gl.getProgramInfoLog(program) !== '') {
-            console.warn('Warning: gl.getProgramInfoLog()', gl.getProgramInfoLog(program));
-        }
-
-        gl.deleteProgram(program);
-    }
-
-    useProgram(gl, program);
-
-    // clean up some shaders
-    gl.deleteShader(vertexShader);
-    gl.deleteShader(fragmentShader);
-
-    const attrs = extractAttributes(gl, program);
-    const uniforms = extractUniforms(gl, program);
-    
-    return {
-        program,
-        attrs,
-        uniforms
-    };
-}
-
-// 采用program
-function useProgram(gl, program) {
-    return gl.useProgram(program); // 告诉 webgl 用这个 program 进行渲染
-}
-
-function extractAttributes(gl, program) {
-    const attributes = {};
-
-    const count = gl.getProgramParameter(program, gl.ACTIVE_ATTRIBUTES);
-
-    for (let i = 0; i < count; i++){
-        const attribData = gl.getActiveAttrib(program, i);
-        const type = mapType(gl, attribData.type);
-        attributes[attribData.name] = {
-            attribData,
-            size: mapSize(type),
-            type,
-            location: gl.getAttribLocation(program, attribData.name),            
-        };
-    }
-
-    return attributes;
-}
-
-function extractUniforms(gl, program) {
-	const uniforms = {};
-
-    const count = gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS);
-
-    for (let i = 0; i < count; i++) {
-    	const uniformData = gl.getActiveUniform(program, i);
-    	const name = uniformData.name.replace(/\[.*?\]/, "");
-        const type = mapType(gl, uniformData.type );
-
-    	uniforms[name] = {
-            uniformData,
-    		type: type,
-    		size: uniformData.size,
-    		location: gl.getUniformLocation(program, name),
-    	};
-    }
-
-	return uniforms;
-};
-
-
-// 把缓冲区的值写入变量
-// size: 组成数量，必须是1，2，3或4.  每个单元由多少个数组成
-// strip: 步长 数组中一行长度，0 表示数据是紧密的没有空隙，让OpenGL决定具体步长
-// offset: 字节偏移量，必须是类型的字节长度的倍数。
-// dataType: 每个元素的数据类型
-function writeVertexAttrib(gl, buffer, attr, size=2, strip=0, offset=0, dataType=gl.FLOAT) {
-    gl.bindBuffer(buffer.type, buffer.buffer);
-    gl.vertexAttribPointer( // 告诉 OpenGL 如何从 Buffer 中获取数据
-            attr.location, // 顶点属性的索引
-            size, // 组成数量，必须是1，2，3或4。我们只提供了 x 和 y
-            dataType,
-            false, // 是否归一化到特定的范围，对 FLOAT 类型数据设置无效
-            strip * buffer.unitSize,
-            offset
-        );
-    gl.enableVertexAttribArray(attr.location);
-    return buffer;
-}
-
-function disableVertexAttribArray(gl, attr) {
-    return gl.disableVertexAttribArray(attr.location);
-}
-
-function getAttribLocation(gl, program, name) {
-    return gl.getAttribLocation(program, name);
-}
-
-function getUniformLocation(gl, program, name) {
-    return gl.getUniformLocation(program, name);
-}
-
-export {
-    createProgram,
-    useProgram,
-    getAttribLocation,
-    getUniformLocation,
-    extractAttributes,
-    extractUniforms,
-    writeVertexAttrib,
-    disableVertexAttribArray
+import {
+    createShader
+} from './shader.js';
+import {
+    mapSize
+} from './mapSize.js';
+import {
+    mapType
+} from './mapType.js';
+
+// 创建程序
+function createProgram(gl, vertexSrc, fragmentSrc) {
+    // 创建顶点着色器
+    const vertexShader = createShader(gl, gl.VERTEX_SHADER, vertexSrc);
+    // 创建片段着色器
+    const fragmentShader = createShader(gl, gl.FRAGMENT_SHADER, fragmentSrc);
+
+    const program = gl.createProgram() // 创建一个程序
+    gl.attachShader(program, vertexShader) // 添加顶点着色器
+    gl.attachShader(program, fragmentShader) // 添加片元着色器
+    gl.linkProgram(program) // 连接 program 中的着色器
+
+    // 检查程序链接状态
+    if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+        console.error('PError: Could not initialize shader.');
+        console.error('gl.VALIDATE_STATUS', gl.getProgramParameter(program, gl.VALIDATE_STATUS));
+        console.error('gl.getError()', gl.getError());
+
+        // if there is a program info log, log it
+        if (gl.getProgramInfoLog(program) !== '') {
+            console.warn('Warning: gl.getProgramInfoLog()', gl.getProgramInfoLog(program));
+        }
+
+        gl.deleteProgram(program);
+    }
+
+    useProgram(gl, program);
+
+    // clean up some shaders
+    gl.deleteShader(vertexShader);
+    gl.deleteShader(fragmentShader);
+
+    const attrs = extractAttributes(gl, program);
+    const uniforms = extractUniforms(gl, program);
+    
+    return {
+        program,
+        attrs,
+        uniforms
+    };
+}
+
+// 采用program
+function useProgram(gl, program) {
+    return gl.useProgram(program); // 告诉 webgl 用这个 program 进行渲染
+}
+
+function extractAttributes(gl, program) {
+    const attributes = {};
+
+    const count = gl.getProgramParameter(program, gl.ACTIVE_ATTRIBUTES);
+
+    for (let i = 0; i < count; i++){
+        const attribData = gl.getActiveAttrib(program, i);
+        const type = mapType(gl, attribData.type);
+        attributes[attribData.name] = {
+            attribData,
+            size: mapSize(type),
+            type,
+            location: gl.getAttribLocation(program, attribData.name),            
+        };
+    }
+
+    return attributes;
+}
+
+function extractUniforms(gl, program) {
+	const uniforms = {};
+
+    const count = gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS);
+
+    for (let i = 0; i < count; i++) {
+    	const uniformData = gl.getActiveUniform(program, i);
+    	const name = uniformData.name.replace(/\[.*?\]/, "");
+        const type = mapType(gl, uniformData.type );
+
+    	uniforms[name] = {
+            uniformData,
+    		type: type,
+    		size: uniformData.size,
+    		location: gl.getUniformLocation(program, name),
+    	};
+    }
+
+	return uniforms;
+};
+
+
+// 把缓冲区的值写入变量
+// size: 组成数量，必须是1，2，3或4.  每个单元由多少个数组成
+// strip: 步长 数组中一行长度，0 表示数据是紧密的没有空隙，让OpenGL决定具体步长
+// offset: 字节偏移量，必须是类型的字节长度的倍数。
+// dataType: 每个元素的数据类型
+function writeVertexAttrib(gl, buffer, attr, size=2, strip=0, offset=0, dataType=gl.FLOAT) {
+    gl.bindBuffer(buffer.type, buffer.buffer);
+    gl.vertexAttribPointer( // 告诉 OpenGL 如何从 Buffer 中获取数据
+            attr.location, // 顶点属性的索引
+            size, // 组成数量，必须是1，2，3或4。我们只提供了 x 和 y
+            dataType,
+            false, // 是否归一化到特定的范围，对 FLOAT 类型数据设置无效
+            strip * buffer.unitSize,
+            offset
+        );
+    gl.enableVertexAttribArray(attr.location);
+    return buffer;
+}
+
+function disableVertexAttribArray(gl, attr) {
+    return gl.disableVertexAttribArray(attr.location);
+}
+
+function getAttribLocation(gl, program, name) {
+    return gl.getAttribLocation(program, name);
+}
+
+function getUniformLocation(gl, program, name) {
+    return gl.getUniformLocation(program, name);
+}
+
+export {
+    createProgram,
+    useProgram,
+    getAttribLocation,
+    getUniformLocation,
+    extractAttributes,
+    extractUniforms,
+    writeVertexAttrib,
+    disableVertexAttribArray
 }

package/src/lib/webgl/core/shader.js

@@ -1,14 +1,14 @@
-// 生成着色器
-// type: gl.VERTEX_SHADER 顶点着色器  , gl.FRAGMENT_SHADER  片段着色器
-// src: 着色器代码
-function createShader(gl, type, src) {
-    const shader = gl.createShader(type) // 创建一个顶点着色器
-    gl.shaderSource(shader, src); // 编写顶点着色器代码
-    gl.compileShader(shader); // 编译着色器
-
-    return shader;
-}
-
-export  {
-    createShader
+// 生成着色器
+// type: gl.VERTEX_SHADER 顶点着色器  , gl.FRAGMENT_SHADER  片段着色器
+// src: 着色器代码
+function createShader(gl, type, src) {
+    const shader = gl.createShader(type) // 创建一个顶点着色器
+    gl.shaderSource(shader, src); // 编写顶点着色器代码
+    gl.compileShader(shader); // 编译着色器
+
+    return shader;
+}
+
+export  {
+    createShader
 }