Skip to content

Changes for AwayFL Stage3D #10

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.

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
wants to merge 19 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
}
2 changes: 1 addition & 1 deletion lib/base/IContextGL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export interface IContextGL

setTextureAt(sampler: number, texture: ITextureBase);

setVertexBufferAt(index: number, buffer: IVertexBuffer, bufferOffset?: number, format?: number);
setVertexBufferAt(index: number, buffer: IVertexBuffer, bufferOffset?: number, format?: number, safeAttributeLocation?: boolean);

setRenderToTexture(
target: ITextureBase,
Expand Down
2 changes: 1 addition & 1 deletion lib/filters/tasks/TaskBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ContextGLProgramType } from '../../base/ContextGLProgramType';
import { _Stage_ImageBase, Image2D } from '../../image';

export class TaskBase {
protected _vertexConstantData = new Float32Array([
protected _vertexConstantData:Float32Array = new Float32Array([
0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0
]);
Expand Down
5 changes: 3 additions & 2 deletions lib/webgl/ContextWebGL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { Settings } from '../Settings';
import { FenceContextWebGL } from './FenceContextWebGL';
import * as GL_MAP from './ConstantsWebGL';
import { StatsWebGL } from './StatsWebGL';
import { IVertexBuffer } from '../base/IVertexBuffer';

let _DEBUG_renderMode: '' | 'line' = '';

Expand Down Expand Up @@ -744,11 +745,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