Skip to content
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

Changes for AwayFL Stage3D #10

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open

Changes for AwayFL Stage3D #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2adfac2
Add uniformMatrix4fv to ProgramWebGL
Fancy2209 Sep 10, 2024
06d74a1
AGALTokenizer fix
Fancy2209 Sep 13, 2024
6d43e5b
Gitignore change
Fancy2209 Sep 13, 2024
41f39fc
Fix typo
Fancy2209 Sep 13, 2024
88209df
Finish up uniformMatrix4fv
Fancy2209 Sep 16, 2024
45858c6
Remove uniformMatrix4fv
Fancy2209 Sep 17, 2024
15de1a3
Merge branch 'awayjs:dev' into Stage3D
Fancy2209 Sep 17, 2024
87ebfb7
Allow unsafe Vertex Buffer Attributes (allows no program to be set)
Fancy2209 Sep 24, 2024
4956b59
Undo Null Changes for now
Fancy2209 Sep 24, 2024
68a7d4a
Fix null stuff
Fancy2209 Sep 24, 2024
80bdf44
Additional null fix
Fancy2209 Sep 24, 2024
602aad7
undo accident
Fancy2209 Oct 1, 2024
af75208
Add profiles
Fancy2209 Oct 3, 2024
7c927c4
undo uneeded changes
Fancy2209 Oct 9, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ npm-debug.log

# Misc
deploy_key
deploy_key.pub
deploy_key.pub
.vscode/settings.json
13 changes: 6 additions & 7 deletions lib/aglsl/AGALTokenizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ export class AGALTokenizer {
}

public decribeAGALPart(array: ByteArray | Part): Description {
if (array instanceof ByteArray) {
if (array instanceof Part) {
const desc = this.decribeAGALByteArray(array.data);
desc.native = array.native;
return desc;
} else
return this.decribeAGALByteArray(array);
}

const desc = this.decribeAGALByteArray(array.data);
desc.native = array.native;

return desc;
}

public decribeAGALByteArray(bytes: ByteArray): Description {
bytes.position = 0;
const header: Header = new Header();

if (bytes.readUnsignedByte() != 0xa0) {
Expand Down
6 changes: 5 additions & 1 deletion lib/base/ContextGLProfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@ export enum ContextGLProfile
{
BASELINE,
BASELINE_CONSTRAINED,
BASELINE_EXTENDED
BASELINE_EXTENDED,
STANDARD,
STANDARD_CONSTRAINED,
STANDARD_EXTENDED,
ENHANCED
}
6 changes: 3 additions & 3 deletions lib/webgl/ContextWebGL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,11 +744,11 @@ export class ContextWebGL implements IContextGL {
}

public setVertexBufferAt(
index: number, buffer: VertexBufferWebGL, bufferOffset: number = 0, format: number = 4
index: number, buffer: VertexBufferWebGL, bufferOffset: number = 0, format: number = 4, safeAttributeLocation:boolean = true
): void {
this.stateChangeCallback && this.stateChangeCallback('setVertexBufferAt');

const location = this._currentProgram ? this._currentProgram.getAttribLocation(index) : -1;
const location = safeAttributeLocation ? this._currentProgram ? this._currentProgram.getAttribLocation(index) : -1 : index;
const gl = this._gl;

// when we try bind any buffers without VAO we should unbound VAO
Expand Down