Skip to content

Temporary pull request. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devnkong wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Temporary pull request. #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
665e803
literally did nothing
devnkong Aug 1, 2018
f8272e1
another day
devnkong Aug 2, 2018
c5ba053
aha
devnkong Aug 3, 2018
2589c96
today
Aug 3, 2018
bfabfab
today
devnkong Aug 4, 2018
e99d229
new
devnkong Aug 7, 2018
ecd2b5d
save
devnkong Aug 7, 2018
53a4448
good
devnkong Aug 8, 2018
0a6ad68
what
Aug 8, 2018
6567eef
today
devnkong Aug 9, 2018
4b552d0
what
Aug 9, 2018
9adb569
now
devnkong Aug 10, 2018
94ee7b2
en
devnkong Aug 11, 2018
3954422
today
Aug 13, 2018
42ca3fb
yeah
devnkong Aug 14, 2018
e118ca8
today
devnkong Aug 15, 2018
ea8ceca
organize
devnkong Aug 15, 2018
4657b30
organize
devnkong Aug 15, 2018
45fd3c8
nnn
devnkong Aug 16, 2018
8d4ac83
enen
devnkong Aug 17, 2018
2f28778
enen
devnkong Aug 17, 2018
f97d0f4
add shader module
devnkong Aug 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
enen
  • Loading branch information
@devnkong
devnkong committed Aug 17, 2018
commit 2f28778441604fcc1ca66f06d8b805ab75786f6b
4 changes: 2 additions & 2 deletions dist/flexgl.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/flexgl.min.js
View file
Open in desktop

Large diffs are not rendered by default.

291 changes: 157 additions & 134 deletions example/simpledraw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,165 @@ fxgl.attribute('a_position', 'vec2', [-1.0, -1.0, 1.0, 1.0])
.framebuffer('f_mem_texture_0', 'float', [1024, 1], fxgl.texture['f_mem_texture_0'])
.framebuffer('f_mem_texture_1', 'float', [1024, 1], fxgl.texture['f_mem_texture_1']);

var data = [];
var sumData = fxgl.app('sumData', {
vertex_shader_source: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fragment_shader_source: `
precision highp float;
uniform sampler2D u_texture;
varying float v_texcoord;

void main(){
float sum = 0.0;
for(float i = 0.0; i < 1024.0; i++){
sum += texture2D(u_texture, vec2(v_texcoord, (i+0.5)/1024.0)).a;
}
sum /= 1024.0;
gl_FragColor = vec4(sum, 0.0, 0.0, 1.0);

}
`,
render: function(args){
this.ctx.viewport(0, 0, 1024, 1);
this.bindFramebuffer('f_sum_texture');
this.ctx.drawArrays(this.ctx.LINES, 0, 2);
}
});

var swingDataA = fxgl.app('swingDataA', {
vertex_shader_source: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fragment_shader_source: `
precision highp float;
uniform sampler2D f_sum_texture;
uniform sampler2D f_mem_texture_0;
varying float v_texcoord;

void main(){
float v0 = texture2D(f_sum_texture, vec2(v_texcoord, 0.5)).x;
float v1 = texture2D(f_mem_texture_0, vec2(v_texcoord, 0.5)).x;
gl_FragColor = vec4(v0+v1, 0.0, 0.0, 1.0);
}
`,
render: function(args){
this.ctx.viewport(0, 0, 1024, 1);
this.bindFramebuffer('f_mem_texture_1');
this.ctx.drawArrays(this.ctx.LINES, 0, 2);
}
});

var drawDataA = fxgl.app('drawDataA', {
vertex_shader_source: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fragment_shader_source: `
precision highp float;
uniform sampler2D f_mem_texture_1;
varying float v_texcoord;

void main(){
gl_FragColor = texture2D(f_mem_texture_1, vec2(v_texcoord, 0.5));
}
`,
render: function(args){
this.ctx.viewport(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
this.bindFramebuffer(null);
this.ctx.drawArrays(this.ctx.LINES, 0, 2);
}
});

var swingDataB = fxgl.app('swingDataB', {
vertex_shader_source: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fragment_shader_source: `
precision highp float;
uniform sampler2D f_sum_texture;
uniform sampler2D f_mem_texture_1;
varying float v_texcoord;

void main(){
float v0 = texture2D(f_sum_texture, vec2(v_texcoord, 0.5)).x;
float v1 = texture2D(f_mem_texture_1, vec2(v_texcoord, 0.5)).x;
gl_FragColor = vec4(v0+v1, 0.0, 0.0, 1.0);
}
`,
render: function(args){
this.ctx.viewport(0, 0, 1024, 1);
this.bindFramebuffer('f_mem_texture_0');
this.ctx.drawArrays(this.ctx.LINES, 0, 2);
}
});

var drawDataB = fxgl.app('drawDataB', {
vertex_shader_source: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fragment_shader_source: `
precision highp float;
uniform sampler2D f_mem_texture_0;
varying float v_texcoord;

void main(){
gl_FragColor = texture2D(f_mem_texture_0, vec2(v_texcoord, 0.5));
}
`,
render: function(args){
this.ctx.viewport(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
this.bindFramebuffer(null);
this.ctx.drawArrays(this.ctx.LINES, 0, 2);
}
});

var total_data = [];
for(var j = 0; j < 100; j++){
var typedArray = new Float32Array(1024*1024);
for (var i = 0; i < typedArray.length; i++){
typedArray[i] = Math.random()/100;
}
data.push(typedArray);
total_data.push(typedArray);
}


// var data = new Float32Array(1024*1024);
// for (var i = 0; i < data.length; i++){
// data[i] = Math.random();
// }


var pointer = -1;


var updateButton = document.querySelector('.update');
var updateClickStream = Rx.Observable.fromEvent(updateButton, 'click');

Expand All @@ -48,9 +188,11 @@ var requestStream = updateClickStream.startWith('startup click')

var responseStream = requestStream
.map(function(p){
return data[pointer];
return total_data[pointer];
});



var i = 0;
responseStream.subscribe(function(data_chunk){
if(pointer === 0){
Expand All @@ -59,135 +201,16 @@ responseStream.subscribe(function(data_chunk){
else{
fxgl.texture['u_texture'] = data_chunk;
}
fxgl.app('drawLine0', {
vsource: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fsource: `
precision highp float;
uniform sampler2D u_texture;
varying float v_texcoord;

void main(){
float sum = 0.0;
for(float i = 0.0; i < 1024.0; i++){
sum += texture2D(u_texture, vec2(v_texcoord, (i+0.5)/1024.0)).a;
}
sum /= 1024.0;
gl_FragColor = vec4(sum, 0.0, 0.0, 1.0);

}
`,
}, 0);



sumData();
if(i%2 === 0){
fxgl.app('drawLine2', {
vsource: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fsource: `
precision highp float;
uniform sampler2D f_sum_texture;
uniform sampler2D f_mem_texture_0;
varying float v_texcoord;

void main(){
float v0 = texture2D(f_sum_texture, vec2(v_texcoord, 0.5)).x;
float v1 = texture2D(f_mem_texture_0, vec2(v_texcoord, 0.5)).x;
gl_FragColor = vec4(v0+v1, 0.0, 0.0, 1.0);
}
`,
}, 2);

fxgl.app('drawLine4', {
vsource: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fsource: `
precision highp float;
uniform sampler2D f_mem_texture_1;
varying float v_texcoord;

void main(){
gl_FragColor = texture2D(f_mem_texture_1, vec2(v_texcoord, 0.5));
}
`,
}, 4);

swingDataA();
drawDataA();
}
else{
fxgl.app('drawLine3', {
vsource: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fsource: `
precision highp float;
uniform sampler2D f_sum_texture;
uniform sampler2D f_mem_texture_1;
varying float v_texcoord;

void main(){
float v0 = texture2D(f_sum_texture, vec2(v_texcoord, 0.5)).x;
float v1 = texture2D(f_mem_texture_1, vec2(v_texcoord, 0.5)).x;
gl_FragColor = vec4(v0+v1, 0.0, 0.0, 1.0);
}
`,
}, 3);

fxgl.app('drawLine5', {
vsource: `
attribute vec2 a_position;
attribute float a_texcoord;
varying float v_texcoord;

void main(){
gl_Position = vec4(a_position, 0, 1.0);
v_texcoord = a_texcoord;
}
`,
fsource: `
precision highp float;
uniform sampler2D f_mem_texture_0;
varying float v_texcoord;

void main(){
gl_FragColor = texture2D(f_mem_texture_0, vec2(v_texcoord, 0.5));
}
`,
}, 5);

swingDataB();
drawDataB();
}

i++;
});

Expand Down
Loading