Skip to content

Added setters for width/height and get/set resolution of Pixelate effect #12

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

Added setters for width/height and get/set resolution of Pixelate effect #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca22cb2
adding getter/setter for resolution in pixelate effect
darrenmothersele Sep 15, 2014
1fe3869
add setters for width/height
darrenmothersele Sep 15, 2014
c682428
add setter for bloom/convolution params
darrenmothersele Sep 18, 2014
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
9 changes: 5 additions & 4 deletions example/example.xcodeproj/xcshareddata/xcschemes/example Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Release">
<Testables>
Expand All @@ -39,11 +39,12 @@
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
Expand Down
5 changes: 5 additions & 0 deletions src/BloomPass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ namespace itg
void allocateSelectiveGlow(unsigned w, unsigned h);
void beginSelectiveGlow(bool clear = true);
void endSelectiveGlow();

void setIncrements(float _x1, float _y1, float _x2, float _y2) {
xConv->setIncrement(_x1, _y1);
yConv->setIncrement(_x2, _y2);
}

void debugDraw();

Expand Down
7 changes: 6 additions & 1 deletion src/ConvolutionPass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ namespace itg
typedef shared_ptr<ConvolutionPass> Ptr;

ConvolutionPass(const ofVec2f& aspect, bool arb, const ofVec2f& imageIncrement = ofVec2f(0.001953125, 0), float sigma = 4, unsigned kernelSize = 25);


void setIncrement(float _x, float _y) {
imageIncrement.x = _x;
imageIncrement.y = _y;
}

void render(ofFbo& readFbo, ofFbo& writeFbo);

bool hasArbShader() { return true; }
Expand Down
6 changes: 5 additions & 1 deletion src/PixelatePass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ namespace itg
PixelatePass(const ofVec2f& aspect, bool arb, const ofVec2f& resolution = ofVec2f(100.f, 100.f));

void render(ofFbo& readFbo, ofFbo& writeFbo);


ofVec2f getResolution() const { return resolution; }
void setResolution(ofVec2f) { this->resolution = resolution; }
void setResolution(float _w, float _h) { this->resolution = ofVec2f(_w, _h); }

private:
ofShader shader;
ofVec2f resolution;
Expand Down
4 changes: 3 additions & 1 deletion src/PostProcessing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ namespace itg
void draw(float x, float y, float w, float h);
float getWidth() { return width; }
float getHeight() { return height; }

void setWidth(float _w) { width = _w; }
void setHeight(float _h) { height = _h; }

void debugDraw();

template<class T>
Expand Down