.

Author: Quarkblue

Advanced-Cpp-Programming.vcxproj

@@ -137,12 +137,14 @@
     <ClInclude Include="Cpp%2711 New features\Ring.h" />
     <ClInclude Include="Template Classes and Functions\Template-class.h" />
     <ClInclude Include="Fractal Images\Zoom.h" />
+    <ClInclude Include="Fractal Images\ZoomList.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Fractal Images\Bitmap.cpp" />
     <ClCompile Include="Fractal Images\main.cpp" />
     <ClCompile Include="Fractal Images\Mandelbrot.cpp" />
     <ClCompile Include="Operator Overloading\Complex.cpp" />
+    <ClCompile Include="Fractal Images\ZoomList.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Advanced-Cpp-Programming.vcxproj.filters

@@ -42,6 +42,9 @@
     <ClInclude Include="Fractal Images\Zoom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Fractal Images\ZoomList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Operator Overloading\Complex.cpp">
@@ -56,5 +59,8 @@
     <ClCompile Include="Fractal Images\Mandelbrot.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Fractal Images\ZoomList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Fractal Images/ZoomList.cpp

@@ -1,5 +1,8 @@
+#include<iostream>
 #include "ZoomList.h"
 
+using namespace std;
+
 namespace fractal {
 
 	ZoomList::ZoomList(int width, int height) : m_width(width), m_height(height) {
@@ -8,6 +11,14 @@ namespace fractal {
 
 	void ZoomList::add(const Zoom& zoom) {
 		zooms.push_back(zoom);
+
+
+		m_xCenter += (zoom.x - m_width / 2) * m_scale;
+		m_yCenter += (zoom.y - m_height / 2) * m_scale;
+
+		m_scale *= zoom.scale;
+
+		cout << m_xCenter << ", " << m_yCenter << ", " << m_scale << endl;
 	}
 
 	pair<double, double> ZoomList::doZoom(int x, int y) {

Fractal Images/ZoomList.h

@@ -13,6 +13,9 @@ namespace fractal {
 
 	class ZoomList{
 	private:
+		double m_xCenter{0};
+		double m_yCenter{0};
+		double m_scale{1.0};
 		int m_width{0};
 		int m_height{0};
 		vector<Zoom> zooms;

Fractal Images/main.cpp

@@ -8,6 +8,7 @@
 
 #include"Bitmap.h"
 #include"Mandelbrot.h"
+#include"Zoom.h"
 #include "ZoomList.h"
 
 using namespace std;
@@ -24,6 +25,10 @@ int main() {
 
 	double min = 99999;
 	double max = -99999;
+	
+	ZoomList zoomList(WIDTH, HEIGHT);
+	
+	zoomList.add(Zoom(WIDTH/2, HEIGHT/2, 1));
 
 	unique_ptr<int[]> histogram(new int[Mandelbrot::MAX_ITERATIONS]());
 	unique_ptr<int[]> fractal(new int[WIDTH * HEIGHT]());
@@ -81,14 +86,9 @@ int main() {
 
 	int count = 0;
 	for (int i = 0; i < Mandelbrot::MAX_ITERATIONS; i++) {
-		cout << histogram[i] << " " << flush;
 		count += histogram[i];
 	}
 
-	cout << count << " : " << WIDTH * HEIGHT << endl;
-	
-	cout << endl;
-
 
 	bitmap.write("test.bmp");