Skip to content

Fix warning messages on pixel inspector and depth inspector #110

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix warning messages on pixel inspector and depth inspector #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 16 additions & 25 deletions src/content_script/depth_inspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,28 +127,7 @@ glpDepthInspector.prototype.disable = function() {
this.gl.useProgram(newProgram);
this.copyUniforms(currentProgram, newProgram);
}
}

glpDepthInspector.prototype.bindFrameBuffer = function(enable) {
this.framebufferIsBound = !!enable;
this.toggleByBuffer(!!enable);
}

glpDepthInspector.prototype.bindRenderBuffer = function(enable) {
this.renderbufferIsBound = !!enable;
this.toggleByBuffer(!!enable);
}

glpDepthInspector.prototype.toggleByBuffer = function(enable) {
if (!this.enabled) {
return;
}

if (!this.framebufferIsBound && !this.renderbufferIsBound) {
this.enable();
} else {
this.disable();
}
this.locationMap = {}
}

/**
Expand Down Expand Up @@ -273,15 +252,27 @@ glpDepthInspector.prototype.uniforms = function(args) {
var program = args[0];
var location = args[1];
if (this.programs.indexOf(program.__uuid) >= 0) {
// the program is a pixel inspector
// lets check if the location is from the original program
// if so, switch the location
// else, switch the program to the original program
if (location in this.locationMap[program.__uuid]) {
// the program is the pixel inspector version and we're using the original location
args[1] = this.locationMap[program.__uuid][location.__uuid];
} else {
args[0] = this.originalPrograms[program.__uuid];
}
} else {
// the program is not a pixel inspector
// if they're using the wrong location, lets just swap programs
args[0] = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
// lets check if the location is from the original program
// if so, switch programs and location
if (program.__uuid in this.locationMap){
if (this.locationMap[program.__uuid] && location.__uuid in this.locationMap[program.__uuid]) {
args[0] = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
} else {
args[1] = this.locationMap[program.__uuid][location.__uuid];
}
}
//else switch program was never called and no changes need to be made
}
}
return args;
Expand Down
20 changes: 17 additions & 3 deletions src/content_script/pixel_inspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ glpPixelInspector.prototype.disable = function() {
this.gl.useProgram(newProgram);
this.copyUniforms(currentProgram, newProgram);
}

this.locationMap = {}
}

/**
Expand Down Expand Up @@ -307,15 +309,27 @@ glpPixelInspector.prototype.uniforms = function(args) {
var program = args[0];
var location = args[1];
if (this.programs.indexOf(program.__uuid) >= 0) {
// the program is a pixel inspector
// lets check if the location is from the original program
// if so, switch the location
// else, switch the program to the original program
if (location in this.locationMap[program.__uuid]) {
// the program is the pixel inspector version and we're using the original location
args[1] = this.locationMap[program.__uuid][location.__uuid];
} else {
args[0] = this.originalPrograms[program.__uuid];
}
} else {
// the program is not a pixel inspector
// if they're using the wrong location, lets just swap programs
args[0] = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
// lets check if the location is from the original program
// if so, switch programs and location
if (program.__uuid in this.locationMap){
if (this.locationMap[program.__uuid] && location.__uuid in this.locationMap[program.__uuid]) {
args[0] = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
} else {
args[1] = this.locationMap[program.__uuid][location.__uuid];
}
}
//else switch program was never called and no changes need to be made
}
}
return args;
Expand Down