X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F02_Mandelbrot_Julia%2Fprovider%2FFractalProvider.cpp;h=ba94d7334b1c908986809e7c4ae5f7dcf69aafd9;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hp=9a824a220236c5feb90ff08c992836976180594a;hpb=7798b7c27cf13aaeada22faae8648df8cb339f1b;p=GPU.git

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/provider/FractalProvider.cpp b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/provider/FractalProvider.cpp
index 9a824a2..ba94d73 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/provider/FractalProvider.cpp
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/02_Mandelbrot_Julia/provider/FractalProvider.cpp
@@ -1,55 +1,29 @@
 #include "FractalProvider.h"
 
+Fractal* MandelbrotProvider::create()
+    {
+    int dw = 16 * 50;
+    int dh = 16 * 30;
 
-/*----------------------------------------------------------------------*\
- |*			Declaration 					*|
- \*---------------------------------------------------------------------*/
-
-/*--------------------------------------*\
- |*		Imported	 	*|
- \*-------------------------------------*/
-
-/*--------------------------------------*\
- |*		Public			*|
- \*-------------------------------------*/
-
-/*--------------------------------------*\
- |*		Private			*|
- \*-------------------------------------*/
-
-/*----------------------------------------------------------------------*\
- |*			Implementation 					*|
- \*---------------------------------------------------------------------*/
-
-/*--------------------------------------*\
- |*		Public			*|
- \*-------------------------------------*/
-
-/*-----------------*\
- |*	static	   *|
- \*----------------*/
+    return new FractalMandelbrot(dw, dh, 1);
+    }
 
-Fractal* FractalProvider::create()
+Fractal* JuliaProvider::create()
     {
-    int dw = 16 * 30;
+    int dw = 16 * 50;
     int dh = 16 * 30;
 
-    float dt = 2 * PI / 8000;
-    int n = 2;
-
-    return new Fractal(dw, dh, dt, n);
+    return new FractalJulia(dw, dh, 300, -0.745, -0.32, -0.09, 0.1);
     }
 
-ImageFonctionel* FractalProvider::createGL()
+ImageFonctionel* MandelbrotProvider::createGL()
     {
-    ColorRGB_01* ptrColorTitre = new ColorRGB_01(0, 0, 0);
+    ColorRGB_01* ptrColorTitre = new ColorRGB_01(0, 0, 100);
     return new ImageFonctionel(create(), ptrColorTitre); // both ptr destroy by destructor of ImageFonctionel
     }
 
-/*--------------------------------------*\
- |*		Private			*|
- \*-------------------------------------*/
-
-/*----------------------------------------------------------------------*\
- |*			End	 					*|
- \*---------------------------------------------------------------------*/
+ImageFonctionel* JuliaProvider::createGL()
+    {
+    ColorRGB_01* ptrColorTitre = new ColorRGB_01(0, 0, 100);
+    return new ImageFonctionel(create(), ptrColorTitre); // both ptr destroy by destructor of ImageFonctionel
+    }