Skip to content

Commit

Permalink
www
Browse files Browse the repository at this point in the history
  • Loading branch information
SoutaTanaka committed Aug 26, 2018
1 parent 742fee3 commit 53edb27
Show file tree
Hide file tree
Showing 10 changed files with 262 additions and 21 deletions.
1 change: 1 addition & 0 deletions addons.make
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ofxGui
Binary file added bin/julia
Binary file not shown.
83 changes: 83 additions & 0 deletions julia.qbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import qbs
import qbs.Process
import qbs.File
import qbs.FileInfo
import qbs.TextFile
import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp

Project{
property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''}

ofApp {
name: { return FileInfo.baseName(sourceDirectory) }

files: [
'src/main.cpp',
'src/ofApp.cpp',
'src/ofApp.h',
]

of.addons: [
'ofxGui',
]

of.addons: [
%{JS:
[].concat(%{ofx3DModelLoader} ? ['\'ofx3DModelLoader\''] : [])
.concat(%{ofxAssimpModelLoader} ? ['\'ofxAssimpModelLoader\''] : [])
.concat(%{ofxGui} ? ['\'ofxGui\''] : [])
.concat(%{ofxKinect} ? ['\'ofxKinect\''] : [])
.concat(%{ofxNetwork} ? ['\'ofxNetwork\''] : [])
.concat(%{ofxOpenCv} ? ['\'ofxOpenCv\''] : [])
.concat(%{ofxOsc} ? ['\'ofxOsc\''] : [])
.concat(%{ofxSvg} ? ['\'ofxSvg\''] : [])
.concat(%{ofxVectorGraphics} ? ['\'ofxVectorGraphics\''] : [])
.concat(%{ofxXmlSettings} ? ['\'ofxXmlSettings\''] : []).toString()
}
]

// additional flags for the project. the of module sets some
// flags by default to add the core libraries, search paths...
// this flags can be augmented through the following properties:
of.pkgConfigs: [] // list of additional system pkgs to include
of.includePaths: [] // include search paths
of.cFlags: [] // flags passed to the c compiler
of.cxxFlags: [] // flags passed to the c++ compiler
of.linkerFlags: [] // flags passed to the linker
of.defines: [] // defines are passed as -D to the compiler
// and can be checked with #ifdef or #if in the code
of.frameworks: [] // osx only, additional frameworks to link with the project
of.staticLibraries: [] // static libraries
of.dynamicLibraries: [] // dynamic libraries

// other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html
// eg: this will enable ccache when compiling
//
// cpp.compilerWrapper: 'ccache'

Depends{
name: "cpp"
}

// common rules that parse the include search paths, core libraries...
Depends{
name: "of"
}

// dependency with the OF library
Depends{
name: "openFrameworks"
}
}

property bool makeOF: true // use makfiles to compile the OF library
// will compile OF only once for all your projects
// otherwise compiled per project with qbs


property bool precompileOfMain: false // precompile ofMain.h
// faster to recompile when including ofMain.h
// but might use a lot of space per project

references: [FileInfo.joinPaths(of_root, "/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs")]
}
2 changes: 1 addition & 1 deletion obj/linux64/Release/.compiler_flags
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-O3 -march=native -mtune=native -DNDEBUG -Wall -Werror=return-type -std=c++14 -DGCC_HAS_REGEX -DOF_USING_GTK -DOF_USING_GTK -DOF_USING_MPG123 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/uuid -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -I/usr/include/AL -I/usr/include/rtaudio -D_FORTIFY_SOURCE=2 -D__UNIX_JACK__ -D__LINUX_ALSA__ -D__LINUX_PULSE__ -I/usr/include/alsa -D_REENTRANT -I/usr/include/libdrm -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -pthread -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/fmodex/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/gtc -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/detail -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/simd -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/gtx -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/json/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/kiss/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/pugixml/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/tess2/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/utf8/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/utf8/include/utf8 -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/communication -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/math -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/utils -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/sound -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/events -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/graphics -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/app -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/gl -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/types -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/video -I/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src -Wl,-rpath=./libs:./bin/libs -Wl,--as-needed -Wl,--gc-sections -fuse-ld=gold -L/home/sota/of_v0.10.0_linux64gcc6_release/libs/fmodex/lib/linux64/ -lfmodex
-O3 -march=native -mtune=native -DNDEBUG -Wall -Werror=return-type -std=c++14 -DGCC_HAS_REGEX -DOF_USING_GTK -DOF_USING_GTK -DOF_USING_MPG123 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/uuid -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -I/usr/include/AL -I/usr/include/rtaudio -D_FORTIFY_SOURCE=2 -D__UNIX_JACK__ -D__LINUX_ALSA__ -D__LINUX_PULSE__ -I/usr/include/alsa -D_REENTRANT -I/usr/include/libdrm -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -pthread -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/fmodex/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/gtc -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/detail -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/simd -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/glm/include/glm/gtx -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/json/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/kiss/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/pugixml/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/tess2/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/utf8/include -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/utf8/include/utf8 -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/communication -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/math -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/utils -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/sound -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/events -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/graphics -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/app -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/gl -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/types -I/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/video -I/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src -I/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src -Wl,-rpath=./libs:./bin/libs -Wl,--as-needed -Wl,--gc-sections -fuse-ld=gold -L/home/sota/of_v0.10.0_linux64gcc6_release/libs/fmodex/lib/linux64/ -lfmodex
39 changes: 36 additions & 3 deletions obj/linux64/Release/src/main.d
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
obj/linux64/Release/src/main.o: \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/main.cpp \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/main.cpp \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/ofMain.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/utils/ofConstants.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/tess2/include/tesselator.h \
Expand Down Expand Up @@ -520,7 +520,18 @@ obj/linux64/Release/src/main.o: \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/of3dUtils.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofCamera.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofEasyCam.h \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/ofApp.h
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/ofApp.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGui.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxToggle.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxBaseGui.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSlider.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxInputField.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSliderGroup.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGuiGroup.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxButton.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxLabel.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxColorPicker.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxPanel.h

/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/ofMain.h:

Expand Down Expand Up @@ -1594,4 +1605,26 @@ obj/linux64/Release/src/main.o: \

/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofEasyCam.h:

/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/ofApp.h:
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/ofApp.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGui.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxToggle.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxBaseGui.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSlider.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxInputField.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSliderGroup.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGuiGroup.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxButton.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxLabel.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxColorPicker.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxPanel.h:
Binary file modified obj/linux64/Release/src/main.o
Binary file not shown.
43 changes: 38 additions & 5 deletions obj/linux64/Release/src/ofApp.d
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
obj/linux64/Release/src/ofApp.o: \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/ofApp.cpp \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/ofApp.h \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/ofApp.cpp \
/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/ofApp.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/ofMain.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/utils/ofConstants.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/tess2/include/tesselator.h \
Expand Down Expand Up @@ -520,9 +520,20 @@ obj/linux64/Release/src/ofApp.o: \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/video/ofGstVideoPlayer.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/of3dUtils.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofCamera.h \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofEasyCam.h

/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/mandelbrot/src/ofApp.h:
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofEasyCam.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGui.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxToggle.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxBaseGui.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSlider.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxInputField.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSliderGroup.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGuiGroup.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxButton.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxLabel.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxColorPicker.h \
/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxPanel.h

/home/sota/of_v0.10.0_linux64gcc6_release/apps/myApps/julia/src/ofApp.h:

/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/ofMain.h:

Expand Down Expand Up @@ -1595,3 +1606,25 @@ obj/linux64/Release/src/ofApp.o: \
/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofCamera.h:

/home/sota/of_v0.10.0_linux64gcc6_release/libs/openFrameworks/3d/ofEasyCam.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGui.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxToggle.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxBaseGui.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSlider.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxInputField.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxSliderGroup.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxGuiGroup.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxButton.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxLabel.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxColorPicker.h:

/home/sota/of_v0.10.0_linux64gcc6_release/addons/ofxGui/src/ofxPanel.h:
Binary file modified obj/linux64/Release/src/ofApp.o
Binary file not shown.
92 changes: 82 additions & 10 deletions src/ofApp.cpp
Original file line number Diff line number Diff line change
@@ -1,32 +1,103 @@
#include "ofApp.h"
//--------------------------------------------------------------
void ofApp::setup(){
ofBackground(0);

gui.setup();
gui.add(imag.setup("iamg", 0, -2, 2));
gui.add(real.setup("real", 0, -2, 2));
gui.add(x.setup("x", -2, -2, 2));
gui.add(w.setup("w", 4, 0, 4));
gui.add(y.setup("y", -2, -2, 2));
gui.add(h.setup("h", 4, 0, 4));
gui.add(hp.setup("hp X wp", 2000, 500, 5000));
gui.add(mandelbrot.setup("mandelbrot set", false));
gui.add(rerode.setup("rerode"));

//ofBackground(0);
glPointSize(3);
double i, j;
int e, f;
for(i = -2, e = -1 * (h / 2); i <= 2 && e < h / 2 ; i += 4.0 / h, e++){
double i, j, e, f;
for(i = -2, e = -1 * (hp / 2); i <= 2 && e < hp / 2 ; i += 4.0 / hp, e++){
b = -1;
a++;
for(j = -2, f = -1 * ( hp / 2); j <= 2 && f < hp / 2; j += 4.0 / hp, f++){
b++;
p = 0; p.real(i);
p.imag(j);
k = 0;
z = 0;
z.real(imag);
z.imag(real);
while(abs(p) < 2 && k < 400){
k++;
p = p * p + z;
}
mesh.addVertex(ofVec3f(e / 2, f / 2, 0));
mesh.addColor(ofColor::fromHsb(abs(k * 1) % 255, 255, 255, 255));
}
}
}
//--------------------------------------------------------------
//

void ofApp::julia_set(){
mesh.clear();
double i, j, e, f;
for(i = x, e = -1 * (hp / 2); i <= x + w && e < hp / 2 ; i += abs(w) / hp, e++){
b = -1;
a++;
for(j = y, f = -1 * ( hp / 2); j <= y + h && f < hp / 2; j += abs(h) / hp, f++){
b++;
p = 0; p.real(i);
p.imag(j);
k = 0;
z = 0;
z.real(real);
z.imag(imag);
while(abs(p) < 2 && k < 400){
k++;
p = p * p + z;
}
mesh.addVertex(ofVec3f(e / 2, f / 2, 0));
mesh.addColor(ofColor::fromHsb(abs(k * 1) % 255, 255, 255, 255));
}
}
}

void ofApp::mandelbrot_set(){
mesh.clear();
double i, j, e, f;
for(i = -2, e = -1 * (hp / 2); i <= 2 && e < hp / 2 ; i += 4.0 / hp, e++){
b = -1;
a++;
for(j = -2, f = -1 * ( w / 2); j <= 2 && f < w / 2; j += 4.0 / w, f++){
for(j = -2, f = -1 * ( hp / 2); j <= 2 && f < hp / 2; j += 4.0 / hp, f++){
b++;
p = 0;
p.real(i);
p.imag(j);
k = 0;
z = 0;
while(abs(z) < 20 && k < 50){
while(abs(z) < 20 && k < 400){
k++;
z = z * z + p;
}
if(k == 50){
mesh.addVertex(ofVec3f(e, f, 0));
mesh.addVertex(ofVec3f(e / 2, f / 2, 0));
mesh.addColor(ofColor::fromHsb(abs(k * 3) % 255, 255, 255, 255));
}}
}
}
}
//--------------------------------------------------------------

void ofApp::update(){

if(rerode == true){
if(mandelbrot == true){
ofApp::mandelbrot_set();
}else{
ofApp::julia_set();
}
}




}
//--------------------------------------------------------------
Expand All @@ -38,6 +109,7 @@ void ofApp::draw(){
ofLine(0, 1000, 0, -1000);
ofLine(1000, 0, -1000, 0);
cam.end();
gui.draw();
}

//--------------------------------------------------------------
Expand Down
23 changes: 21 additions & 2 deletions src/ofApp.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#pragma once
#include "ofMain.h"
#include <complex>

#include <ofxGui.h>

class ofApp : public ofBaseApp{

public:
void setup();
void update();
void draw();
void julia_set();
void mandelbrot_set();

void keyPressed(int key);
void keyReleased(int key);
Expand All @@ -22,10 +24,27 @@ class ofApp : public ofBaseApp{
void dragEvent(ofDragInfo dragInfo);
void gotMessage(ofMessage msg);

int k, h = 5000, w = 5000;
int k;
ofMesh mesh;
complex<double> p, z = 0, c, zn = 0;
ofBoxPrimitive box;
long a = -1, b = 0;
ofEasyCam cam;

ofxPanel gui;
ofxFloatSlider imag;
ofxFloatSlider real;
ofxFloatSlider x;
ofxFloatSlider h;
ofxFloatSlider y;
ofxFloatSlider w;
ofxIntSlider hp;
ofxButton rerode;
ofxToggle mandelbrot;






};

0 comments on commit 53edb27

Please sign in to comment.