Added Error catching for not enough memory for massive resolutions

Signed-off-by: Daniel Rosser <[email protected]>

Author: danoli3

wxRaytracer/raytracer/UserInterface/wxraytracer.cpp

@@ -1195,7 +1195,20 @@ void RenderCanvas::renderStart(void)
 	   renderMode == this->SPIRAL_IN_AND_OUT2 )
 	{
 		vector<Pixel> toRender;
-		toRender.reserve(pixelsToRender);			
+		try 
+		{
+			toRender.reserve(pixelsToRender);		
+		}
+		catch(...)
+		{
+			 unsigned int size = sizeof(Pixel((unsigned) w->vp.hres/2,(unsigned) w->vp.vres/2));
+			 unsigned long memory = ((pixelsToRender * size) * 0.0009765625); // KB
+			 memory = memory * 0.0009765625; // MB
+			 
+			 wxMessageBox(wxT(wxString::Format(wxT("Error: Not enough memory space! Need: %ld MB free RAM"), memory)) );
+			 wxMessageBox(wxT("Resolution may be too great"));
+			 throw 1;
+		}
 
 		// Generate Points for Spiral
 		if(renderMode == this->SPIRAL_IN || renderMode == this->SPIRAL_OUT || renderMode == SPIRAL_IN_AND_OUT || renderMode == SPIRAL_IN_AND_OUT2)
@@ -1676,7 +1689,7 @@ void RenderCanvas::OnQuit()
 				{   wxCriticalSectionLocker enter(*threadsCS[id]);
 					if((*iter) != NULL)
 					{	if ((*iter)->Delete() != wxTHREAD_NO_ERROR )
-							wxLogError("Can't delete the thread!");					
+							wxLogError((wxChar*)"Can't delete the thread!");					
 					}
 				}
 			}

wxRaytracer/raytracer/Utilities/MultiThread.h

@@ -30,13 +30,13 @@ struct RenderedInt {
   int x, y, r, g, b;
 } ;
 
-class Pixel
+struct Pixel
 {
 public:
-   Pixel(int xi, int yi) : x(xi), y(yi)
+   Pixel(unsigned short xi, unsigned short yi) : x(xi), y(yi)
    { }
 
-   int x, y;
+   unsigned short x, y;
 };
 
 

wxRaytracer/raytracer/build/BuildShadedObjects.cpp

@@ -12,9 +12,9 @@ World::build(void) {
 	int num_samples = 1; 
 
 	// view plane  
-	  
-	vp.set_hres(400);
-	vp.set_vres(400);
+	int size = 1;
+	vp.set_hres(400 * size);
+	vp.set_vres(400 * size);
 	vp.set_pixel_size(0.5);
 	vp.set_samples(num_samples);
 
@@ -36,7 +36,7 @@ World::build(void) {
 	pinhole_ptr->set_eye(0, 0, 500); 
 	pinhole_ptr->set_lookat(0.0);
 	pinhole_ptr->set_view_distance(600.0);
-//	pinhole_ptr->set_zoom(1.0f);
+	pinhole_ptr->set_zoom(1.0f * size);
 	pinhole_ptr->compute_uvw();     
 	set_camera(pinhole_ptr);