Skip to content

Commit c89d398

Browse files
Knightro63Knightro63
committed
Fixed binding error
1 parent c96e25a commit c89d398

5 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎flutter_angle/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.3.5
2+
3+
* Fixed: Some web bindings
4+
* Fixed: Web worker rendering backwards
5+
16
## 0.3.4
27

38
* Fixed: web release bug

‎flutter_angle/lib/webgl/angle.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class FlutterAngle{
122122
texture.rawOpenGl.glClearColor(0.0, 0.0, 0.0, 0.0);
123123
texture.rawOpenGl.glClear(16384 | 256 | 1024);
124124
texture.rawOpenGl.glViewport(0, 0, (texture.options.width*texture.options.dpr).toInt(),( texture.options.height*texture.options.dpr).toInt());
125-
_worker?.renderTexture(sourceTexture);
125+
_worker?.renderTexture(sourceTexture,isFBO: true);
126126
texture.rawOpenGl.glFinish();
127127
}
128128
else{

‎flutter_angle/lib/webgl/gles_bindings.dart‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'dart:js_interop';
22
import 'dart:typed_data';
3-
import 'package:flutter/foundation.dart';
43
import './gles_bindings_wasm.dart' as gles;
54
import '../shared/webgl.dart';
65
import '../shared/classes.dart';
@@ -171,15 +170,15 @@ class LibOpenGLES{
171170
gles.glGenerateMipmap(gl, target);
172171
}
173172

174-
void glDeleteTexture(int v0) {
175-
gles.glGenerateMipmap(gl, v0);
173+
void glDeleteTexture(dynamic v0) {
174+
gles.glDeleteTexture(gl, v0);
176175
}
177176

178-
void glDeleteFramebuffer(int framebuffer) {
177+
void glDeleteFramebuffer(dynamic framebuffer) {
179178
gles.glDeleteFramebuffer(gl, framebuffer);
180179
}
181180

182-
void deleteRenderbuffer(int renderbuffer) {
181+
void deleteRenderbuffer(dynamic renderbuffer) {
183182
gles.glDeleteRenderbuffer(gl, renderbuffer);
184183
}
185184

@@ -526,19 +525,19 @@ class LibOpenGLES{
526525
int glCreateTransformFeedback() {
527526
return gles.glCreateTransformFeedback(gl);
528527
}
529-
void glBindTransformFeedback(int target, int id){
528+
void glBindTransformFeedback(int target, dynamic id){
530529
gles.glBindTransformFeedback(gl, target, id);
531530
}
532531

533532
void glTransformFeedbackVaryings(dynamic program, int count, List<String> varyings, int bufferMode) {
534533
gles.glTransformFeedbackVaryings(gl, program, varyings.jsify(), bufferMode);
535534
}
536535

537-
void glDeleteTransformFeedback(int transformFeedback) {
536+
void glDeleteTransformFeedback(dynamic transformFeedback) {
538537
gles.glDeleteTransformFeedback(gl, transformFeedback);
539538
}
540539

541-
bool isTransformFeedback(int transformFeedback) {
540+
bool isTransformFeedback(dynamic transformFeedback) {
542541
return gles.isTransformFeedback(gl, transformFeedback);
543542
}
544543

@@ -569,7 +568,7 @@ class LibOpenGLES{
569568
Uint8List readCurrentPixels(int x, int y, int width, int height) {
570569
int _len = width * height * 4;
571570
var buffer = Uint8List(_len);
572-
gl.readPixels(x, y, width, height, WebGL.RGBA, WebGL.UNSIGNED_BYTE, buffer);
571+
gles.glReadPixels(gl, x, y, width, height, WebGL.RGBA, WebGL.UNSIGNED_BYTE, buffer.jsify());
573572
return buffer;
574573
}
575574

‎flutter_angle/lib/webgl/gles_bindings_wasm.dart‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ external JSAny? glGetString(JSObject gl,String key);
2323
@JS()
2424
external JSObject createTexture(JSObject gl);
2525
@JS()
26-
external void glBindTexture(JSObject gl, int type, JSObject texture);
26+
external void glBindTexture(JSObject gl, int type, JSAny? texture);
2727
@JS()
2828
external void glDrawElementsInstanced(JSObject gl, int mode, int count, int type, int offset, int instanceCount);
2929
@JS()
@@ -80,7 +80,7 @@ external void glDisable(JSObject gl, int v0);
8080
@JS()
8181
external void glBlendEquation(JSObject gl, int v0);
8282
@JS()
83-
external void glUseProgram(JSObject gl, JSObject program);
83+
external void glUseProgram(JSObject gl, JSAny? program);
8484

8585
@JS()
8686
external void glBlendFuncSeparate(JSObject gl, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha);
@@ -116,31 +116,31 @@ external void glCompressedTexImage2D(JSObject gl, int target, int level, int int
116116
@JS()
117117
external void glGenerateMipmap(JSObject gl, int target);
118118
@JS()
119-
external void glDeleteTexture(JSObject gl, int v0);
119+
external void glDeleteTexture(JSObject gl, JSAny? v0);
120120
@JS()
121-
external void glDeleteFramebuffer(JSObject gl, int framebuffer);
121+
external void glDeleteFramebuffer(JSObject gl, JSAny? framebuffer);
122122
@JS()
123-
external void glDeleteRenderbuffer(JSObject gl, int renderbuffer);
123+
external void glDeleteRenderbuffer(JSObject gl, JSAny? renderbuffer);
124124
@JS()
125125
external void glTexParameterf(JSObject gl, int target, int pname, double param);
126126
@JS()
127127
external void glPixelStorei(JSObject gl, int pname, int param);
128128
@JS()
129129
external JSAny? glGetContextAttributes(JSObject gl);
130130
@JS()
131-
external JSAny? glGetProgramParameter(JSObject gl, JSObject program, int pname);
131+
external JSAny? glGetProgramParameter(JSObject gl, JSAny? program, int pname);
132132
@JS()
133-
external JSAny? glGetActiveUniform(JSObject gl, JSObject v0, int v1);
133+
external JSAny? glGetActiveUniform(JSObject gl, JSAny? v0, int v1);
134134
@JS()
135-
external JSAny? glGetActiveAttrib(JSObject gl, JSObject v0, int v1);
135+
external JSAny? glGetActiveAttrib(JSObject gl, JSAny? v0, int v1);
136136
@JS()
137-
external JSAny? glGetUniformLocation(JSObject gl, JSObject program, String name);
137+
external JSAny? glGetUniformLocation(JSObject gl, JSAny? program, String name);
138138
@JS()
139139
external void glClear(JSObject gl, int mask);
140140
@JS()
141141
external JSAny? glCreateBuffer(JSObject gl);
142142
@JS()
143-
external void glBindBuffer(JSObject gl, int target, JSObject buffer);
143+
external void glBindBuffer(JSObject gl, int target, JSAny? buffer);
144144
@JS()
145145
external void glBufferData(JSObject gl, int target, JSAny? data, int usage);
146146
@JS()
@@ -306,13 +306,13 @@ external void glTexStorage3D(JSObject gl, int target, int levels, int internalfo
306306
@JS()
307307
external int glCreateTransformFeedback(JSObject gl);
308308
@JS()
309-
external void glBindTransformFeedback(JSObject gl, int target, int id);
309+
external void glBindTransformFeedback(JSObject gl, int target, JSAny? id);
310310
@JS()
311311
external void glTransformFeedbackVaryings(JSObject gl, JSAny? program, JSAny? varyings, int bufferMode);
312312
@JS()
313-
external void glDeleteTransformFeedback(JSObject gl, int transformFeedback);
313+
external void glDeleteTransformFeedback(JSObject gl, JSAny? transformFeedback);
314314
@JS()
315-
external bool isTransformFeedback(JSObject gl, int transformFeedback);
315+
external bool isTransformFeedback(JSObject gl, JSAny? transformFeedback);
316316
@JS()
317317
external void glBeginTransformFeedback(JSObject gl, int primitiveMode);
318318
@JS()
@@ -339,9 +339,9 @@ external void glUniformBlockBinding(JSObject gl, JSAny? program, int uniformBloc
339339
@JS()
340340
external void glFramebufferTextureLayer(JSObject gl, int target,int attachment, int texture,int level,int layer);
341341
@JS()
342-
external void glClearBufferuiv(JSObject gl, int buffer,int drawbuffer, int value);
342+
external void glClearBufferuiv(JSObject gl, int buffer, int drawbuffer, int value);
343343
@JS()
344-
external void glClearBufferiv(JSObject gl, int buffer,int drawbuffer, int value);
344+
external void glClearBufferiv(JSObject gl, int buffer, int drawbuffer, int value);
345345
@JS()
346346
external void glBindBufferBase(JSObject gl, int target, int index, int buffer);
347347
@JS()
@@ -351,16 +351,17 @@ external void glCopyTexSubImage3D(JSObject gl, int target, int level, int xoffse
351351
@JS()
352352
external void glCompressedTexSubImage3D(JSObject gl, int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int ormat, JSAny pixels);
353353
@JS()
354-
external void glCompressedTexImage3D(JSObject gl, int target,int level,int internalformat,int width, int height, int depth, int border, JSAny pixels);
354+
external void glCompressedTexImage3D(JSObject gl, int target, int level, int internalformat, int width, int height, int depth, int border, JSAny pixels);
355+
356+
355357
@JS()
356-
external String? glGetProgramInfoLog(JSObject gl, JSObject id);
358+
external String? glGetProgramInfoLog(JSObject gl, JSAny? id);
357359
@JS()
358-
external String? glGetShaderInfoLog(JSObject gl, JSObject id);
360+
external String? glGetShaderInfoLog(JSObject gl, JSAny? id);
359361
@JS()
360362
external void glUniformMatrix2fv(JSObject gl, int id, bool transpose, JSAny? values);
361363
@JS()
362-
external bool glIsTransformFeedback(JSObject gl, int transformFeedback);
363-
364+
external bool glIsTransformFeedback(JSObject gl, JSAny? transformFeedback);
364365
@JS()
365366
external void glUniform1uiv(JSObject gl, JSAny? location, JSAny? v);
366367
@JS()
@@ -369,7 +370,6 @@ external void glUniform2uiv(JSObject gl, JSAny? location, JSAny? v);
369370
external void glUniform3uiv(JSObject gl, JSAny? location, JSAny? v);
370371
@JS()
371372
external void glUniform4uiv(JSObject gl, JSAny? location, JSAny? v);
372-
373373
@JS()
374374
external void glUniform1ui(JSObject gl, JSAny? location, int v0);
375375
@JS()

‎flutter_angle/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_angle
22
description: "Flutters Almost Native Graphics Layer Engine is made by google to use OpenGL ES API calls to one of the hardware-supported APIs available for that platform."
3-
version: 0.3.4
3+
version: 0.3.5
44
homepage: https://github.com/Knightro63/flutter_angle/tree/main/flutter_angle
55

66
environment:

0 commit comments

Comments
 (0)