Merge lp:~kiithsacmp/stellarium/glexperiment into lp:stellarium

[Ferdinand Majerech]

Graphics code refactor and solar system shadows.

[treaves (treaves)]

This simply fails to compile.

Looking into it more, there are several issues:
- GL_RGBA32F on Mac is GL_RGBA32F_ARB. It looks like this may be due to Apple not having updated their include files to reflect that it is now standard, and not experimental.

- SolarSystem.cpp:937:12: error: variable length array of non-POD element type 'Vec4f' (aka 'Vector4<float>')
- SolarSystem.cpp:940:22: error: variable length array of non-POD element type 'Mat4d' (aka 'Matrix4<double>')

For those last two, you need to do heap allocation, or refactor the code to use a Qt structure (QVector perhaps?).

Once those are taken care of, it compiles and runs (I used the heap allocation because it was the most expedient solution). However. On my very new, very expensive, very high end computer, the frame rate goes from 75 for the 0.11.4 release we just made, to 15. That's a phenomenal decrease in performance! I'll try it tomorrow on my crappy work machine running Ubuntu, to see how it is there. Is this kind of performance decrease expected?

review: Needs Fixing

[Ferdinand Majerech (kiithsacmp)]

I'll look at those compilation bugs (don't have a Mac, though).

As for performance, there is visible decrease with the GL2 backend
(60-70% performance), but nothing that massive. On my new PC (i5 3570K
3.4GHz, Radeon HD6770, open source AMD drivers (Catalyst doesn't work
for Ubuntu 12.10 yet, but Catalyst with 12.04 had similar slowdown, at
higher FPS))

Also, try the GL1 backend (simplest way is to use --safe-mode) - on my machine
it's speed roughly matches trunk (most of time slightly - ~10% slower,
sometimes, e.g. planet drawing, faster)

Most likely there's a driver specific issue (what's the driver, GPU?
Is that on the Mac?) Maybe a profiler would help.

A profile might help but it usually only helps find CPU-bound problems,
it's unlikely this is the case here.

Also, any shader warnings? (show up during run time)

Going to compare FPS trunk<->refactored right now, will reply later
with results.

On 8/30/12, treaves <email address hidden> wrote:
> Review: Needs Fixing
>
> This simply fails to compile.
>
> Looking into it more, there are several issues:
> - GL_RGBA32F on Mac is GL_RGBA32F_ARB. It looks like this may be due to
> Apple not having updated their include files to reflect that it is now
> standard, and not experimental.
>
> - SolarSystem.cpp:937:12: error: variable length array of non-POD element
> type 'Vec4f' (aka 'Vector4<float>')
> - SolarSystem.cpp:940:22: error: variable length array of non-POD element
> type 'Mat4d' (aka 'Matrix4<double>')
>
> For those last two, you need to do heap allocation, or refactor the code to
> use a Qt structure (QVector perhaps?).
>
> Once those are taken care of, it compiles and runs (I used the heap
> allocation because it was the most expedient solution). However. On my
> very new, very expensive, very high end computer, the frame rate goes from
> 75 for the 0.11.4 release we just made, to 15. That's a phenomenal decrease
> in performance! I'll try it tomorrow on my crappy work machine running
> Ubuntu, to see how it is there. Is this kind of performance decrease
> expected?
> --
> https://code.launchpad.net/~kiithsacmp/stellarium/glexperiment/+merge/121962
> You are the owner of lp:~kiithsacmp/stellarium/glexperiment.
>

[Ferdinand Majerech (kiithsacmp)]

Ok, results:

These are on release builds. Debug builds _are_ a lot slower (not 5
times slower, though) after the refactor, due to a lot of uninlined
functions and invariant calls.

VSync(default on open source drivers) is on, so I'm fixed to at most 60FPS.
No idea how to disable it with these drivers, will google later.

Stellarium just plain opened (default settings, night sky right now):
trunk: 59-60FPS (VSync)
refactored-GL2: 59-60FPS (VSync)
refactored-GL1: 59-60FPS (VSync)

Stellarium opened, disabled atmosphere/ground, zoomed out max, pulsars
enabled at default settings (lots of rectangles)
trunk: 59-60FPS (VSync)
refactored-GL2: 45-55FPS
refactored-GL1: 59-60FPS (VSync)

Looking at Saturn(FOV ~0.01 deg)
trunk: 3-4FPS (WTF? this didn't happen before - yes,
this is trunk, not my code. No debug spam either)
refactored-GL2: 27-29FPS
refactored-GL1: 26-29FPS

Also, is there some shader warning spamming terminal output?
That might decrease FPS quite a bit.

I'll try my integrated Intel GPU (HD2000) later, and maybe old GeForce
(~5years, don't remember which)

On 8/30/12, No Idea <email address hidden> wrote:
> I'll look at those compilation bugs (don't have a Mac, though).
>
> As for performance, there is visible decrease with the GL2 backend
> (60-70% performance), but nothing that massive. On my new PC (i5 3570K
> 3.4GHz, Radeon HD6770, open source AMD drivers (Catalyst doesn't work
> for Ubuntu 12.10 yet, but Catalyst with 12.04 had similar slowdown, at
> higher FPS))
>
> Also, try the GL1 backend (simplest way is to use --safe-mode) - on my
> machine
> it's speed roughly matches trunk (most of time slightly - ~10% slower,
> sometimes, e.g. planet drawing, faster)
>
>
> Most likely there's a driver specific issue (what's the driver, GPU?
> Is that on the Mac?) Maybe a profiler would help.
>
> A profile might help but it usually only helps find CPU-bound problems,
> it's unlikely this is the case here.
>
> Also, any shader warnings? (show up during run time)
>
>
> Going to compare FPS trunk<->refactored right now, will reply later
> with results.
>
> On 8/30/12, treaves <email address hidden> wrote:
>> Review: Needs Fixing
>>
>> This simply fails to compile.
>>
>> Looking into it more, there are several issues:
>> - GL_RGBA32F on Mac is GL_RGBA32F_ARB. It looks like this may be due to
>> Apple not having updated their include files to reflect that it is now
>> standard, and not experimental.
>>
>> - SolarSystem.cpp:937:12: error: variable length array of non-POD element
>> type 'Vec4f' (aka 'Vector4<float>')
>> - SolarSystem.cpp:940:22: error: variable length array of non-POD element
>> type 'Mat4d' (aka 'Matrix4<double>')
>>
>> For those last two, you need to do heap allocation, or refactor the code
>> to
>> use a Qt structure (QVector perhaps?).
>>
>> Once those are taken care of, it compiles and runs (I used the heap
>> allocation because it was the most expedient solution). However. On my
>> very new, very expensive, very high end computer, the frame rate goes
>> from
>> 75 for the 0.11.4 release we just made, to 15. That's a phenomenal
>> decrease
>> in performance! I'll t...

[Ferdinand Majerech (kiithsacmp)]

I tried to max it out to get as low FPS as possible.
I enabled all plugins, grids, markers, etc.
(The result looks crazy: http://ompldr.org/vZmFnaQ/snapshot1.png)

trunk: 23-24FPS
refactored-GL2: 11.5-11.7FPS
refactored-GL1: 13-14FPS

There is quite large slowdown here, but again nowhere near 75>15FPS.

[treaves (treaves)]

Ya, this is my Mac. It has a pretty nice OpenGL profiler, as Mac's use
OpenGL so heavily. I'll give it a spin in that tonight, and make sure I'm
not in debug mode still (I probably was).

On Wed, Aug 29, 2012 at 11:20 PM, Ferdinand Majerech
<email address hidden>wrote:

> I tried to max it out to get as low FPS as possible.
> I enabled all plugins, grids, markers, etc.
> (The result looks crazy: http://ompldr.org/vZmFnaQ/snapshot1.png)
>
> trunk: 23-24FPS
> refactored-GL2: 11.5-11.7FPS
> refactored-GL1: 13-14FPS
>
> There is quite large slowdown here, but again nowhere near 75>15FPS.
> --
>
> https://code.launchpad.net/~kiithsacmp/stellarium/glexperiment/+merge/121962
> You are reviewing the proposed merge of
> lp:~kiithsacmp/stellarium/glexperiment into lp:stellarium.
>

[treaves (treaves)]

Works fine on my Ubuntu box. If you have those two other issues resolved, I'll compile & merge tonight.

[lp:~kiithsacmp/stellarium/glexperiment]

5576. By Ferdinand Majerech on 2012-08-30

Fixed a compilation bug (RGBA_32F/_ARB) on Mac (needs testing).

5577. By Ferdinand Majerech on 2012-08-30

Fixed a release-mode compiler warning.

5578. By Ferdinand Majerech on 2012-08-30

Another release mode compiler warning fix.

5579. By Ferdinand Majerech on 2012-08-30

Fixed strict aliasing issues found in release mode.

5580. By Ferdinand Majerech on 2012-08-30

Fixed shadows compiler bug on Mac. (Needs testing!)

[Ferdinand Majerech (kiithsacmp)]

I've finally tested it on Catalyst - shadows work fine.
The last thing that needs testing is Mac compilation.

So right now I have it tested on:

AMD open source
AMD Catalyst
NVidia Nouveau
Intel open source

All of them work fine.
Intel open source is about same speed as AMD open source, even though on a much crappier GPU.
Nouveau is about 50% of that (30-35FPS zoomed out no atmosphere/ground)
Catalyst is way faster (120-140FPS, the bottleneck here is most likely CPU)

Catalyst became laggy on very close zoom to a planet with GL2 - but that was on 2560x1440 -
most likely shadow fragment shader overhead

Sorry, did no precise measurements. I'd be more interested in measurements
on stuff that is almost too slow so I can improve performance there
(i.e. improving 80 FPS to 120 is not as good as 20 FPS to 30)

Also; one possible source of slowdown on your Mac (but again, not that huge slowdown):
Viewport effects (i.e. spherical mirror distortion) now work even if FBOs are not used,
(previously they would simply be disabled), but with a round-about, slow implementation.

I also disabled FBO for now because there seems to be a bug in GL2 Qt paint engine,
where the paint engine expects certain state to be set to certain values and I wasn't
able to work around that.

So if you have spherical mirror distortion enabled, you're using the fallback
viewport texture implementation instead of FBOs, which is slow. But again,
not 75-to-15 slow, so I'm not sure.

[treaves (treaves)]

O.K. Compiles fine. In RELEASE mode, I still get only 20 FPS. My machine:
- SSD (NO HDD)
- 16 GB memory
- NVidia GeForece GT 650M with 1G memory
- 2.6 GHz Intel Core i7

This is pushing a Retina display which is 2880x1800 and a 27" Thunderbolt display at 2560x1440, so, it is pushing a lot of pixels. I'm still surprised at the difference. We'll get it into trunk and see what happens.

Opening in safe mode allows for up to 25 FPS; so your code, even in GL 1.0, is three times slower.

I did run in Instruments. There are about 30 parameters that I can monitor, but unfortunately my ignorance of OpenGL doesn't allow for understanding what I'm seeing.

There are no log messages about shader issues (or other issues).

[Ferdinand Majerech (kiithsacmp)]

That is... really weird. It would make sense if it would be fragment shader on so many pixels, but
GL1 would be fast then (unless the driver emulates GL1 with a non-cheap fragment shader - but then trunk would be slow, too).

The largest resolution I can test with is 2560x1440, and the AMD open source drivers have no problem with
60 FPS with that resolution. My GPU is probably a bit faster (non-mobile), but it still doesn't explain trunk-vs-refactored difference.

I might try to APITrace pre- and post- change code to see what different calls are emitted, but not right now
(working on statistics right now, want to have that before optimization work).

If your profiler only records GL calls (which is what APITrace does), it's not that useful; you need to know
about how the driver works with which calls to figure out what is slow. It would be awesome to have a profiler
that actually, well, profiles, which is complicated as the GPU is working asynchronously. Afaik AMD gDebugger does something like that, once Catalyst supports 12.10 I might try that.

It would be useful to have a Mac profile with an Intel GPU (afaik there are no Macs with AMD GPUs?), especially trunk-vs-refactored difference. If the problem is still there, it's Mac specific. If not, NVidia specific (or NVidia+Mac specific). Does the Mac have Optimus, and if so, is there some way to force the Intel GPU to be used?

Also, it'd be good to have some Windows numbers. Don't have a Windows box, though, nor any experience with
compiling a C++ project on Windows.

=== modified file '.bzrignore'
--- .bzrignore	2012-07-22 14:33:23 +0000
+++ .bzrignore	2012-08-30 16:29:19 +0000
@@ -4,5 +4,6 @@
 CMakeLists.txt.user
 Stellarium.bat
 stellarium.iss
+*.kdev4
 ./doc/qt.tag
 ./locale

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-25 15:21:39 +0000
+++ CMakeLists.txt	2012-08-30 16:29:19 +0000
@@ -423,6 +423,7 @@
 	${CMAKE_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/src
 	${CMAKE_SOURCE_DIR}/src/core
+	${CMAKE_SOURCE_DIR}/src/core/renderer
 	${CMAKE_SOURCE_DIR}/src/core/modules
 	${CMAKE_SOURCE_DIR}/src/core/planetsephems
 	${CMAKE_SOURCE_DIR}/src/core/external

=== modified file 'Doxyfile.cmake'
--- Doxyfile.cmake	2012-05-09 04:30:26 +0000
+++ Doxyfile.cmake	2012-08-30 16:29:19 +0000
@@ -423,7 +423,7 @@
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
-SORT_MEMBERS_CTORS_1ST = NO
+SORT_MEMBERS_CTORS_1ST = YES
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
 # hierarchy of group names into alphabetical order. If set to NO (the default)
@@ -484,13 +484,13 @@
 # at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
-SHOW_USED_FILES        = NO
+SHOW_USED_FILES        = YES
 
 # If the sources in your project are distributed over multiple directories
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = NO
+SHOW_DIRECTORIES       = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -703,7 +703,7 @@
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.

=== modified file 'data/default_config.ini'
--- data/default_config.ini	2012-08-28 17:10:57 +0000
+++ data/default_config.ini	2012-08-30 16:29:19 +0000
@@ -18,7 +18,8 @@
 vertical_offset                = 0
 minimum_fps                    = 18
 maximum_fps                    = 10000
-viewport_effect                = none
+viewport_effect                = sphericMirrorDistorter
+#viewport_effect                = none
 
 [projection]
 type                           = ProjectionStereographic

=== modified file 'data/shaders/xyYToRGB.glsl'
--- data/shaders/xyYToRGB.glsl	2010-03-04 18:55:22 +0000
+++ data/shaders/xyYToRGB.glsl	2012-08-30 16:29:19 +0000
@@ -16,45 +16,47 @@
 uniform mediump mat4 projectionMatrix;
 
 // Contains the 2d position of the point on the screen (before multiplication by the projection matrix)
-attribute mediump vec2 skyVertex;
+attribute mediump vec2 vertex;
 
 // Contains the r,g,b,Y (luminosity) components.
-attribute highp vec4 skyColor;
+attribute highp vec4 color;
 
 // The output variable passed to the fragment shader
 varying mediump vec4 resultSkyColor;
 
 void main()
 {
-	gl_Position = projectionMatrix*vec4(skyVertex, 0., 1.);
-	highp vec4 color = skyColor;
+	gl_Position = projectionMatrix*vec4(vertex, 0., 1.);
+
+	// Must be a separate variable due to Intel drivers
+	vec4 tempColor = color;
 
 	///////////////////////////////////////////////////////////////////////////
 	// First compute the xy color component
 	// color contains the unprojected vertex position in r,g,b
 	// + the Y (luminance) component of the color in the alpha channel
-	if (color[3]>0.01)
+	if (tempColor[3]>0.01)
 	{
-		highp float cosDistSunq = sunPos[0]*color[0] + sunPos[1]*color[1] + sunPos[2]*color[2];
+		highp float cosDistSunq = sunPos[0]*tempColor[0] + sunPos[1]*tempColor[1] + sunPos[2]*tempColor[2];
 		highp float distSun=acos(cosDistSunq);
-		highp float oneOverCosZenithAngle = (color[2]==0.) ? 9999999999999. : 1. / color[2];
+		highp float oneOverCosZenithAngle = (tempColor[2]==0.) ? 9999999999999. : 1. / tempColor[2];
 
 		cosDistSunq*=cosDistSunq;
-		color[0] = term_x * (1. + Ax * exp(Bx*oneOverCosZenithAngle))* (1. + Cx * exp(Dx*distSun) + Ex * cosDistSunq);
-		color[1] = term_y * (1. + Ay * exp(By*oneOverCosZenithAngle))* (1. + Cy * exp(Dy*distSun) + Ey * cosDistSunq);
-		if (color[0] < 0. || color[1] < 0.)
+		tempColor[0] = term_x * (1. + Ax * exp(Bx*oneOverCosZenithAngle))* (1. + Cx * exp(Dx*distSun) + Ex * cosDistSunq);
+		tempColor[1] = term_y * (1. + Ay * exp(By*oneOverCosZenithAngle))* (1. + Cy * exp(Dy*distSun) + Ey * cosDistSunq);
+		if (tempColor[0] < 0. || tempColor[1] < 0.)
 		{
-			color[0] = 0.25;
-			color[1] = 0.25;
+			tempColor[0] = 0.25;
+			tempColor[1] = 0.25;
 		}
 	}
 	else
 	{
-		color[0] = 0.25;
-		color[1] = 0.25;
+		tempColor[0] = 0.25;
+		tempColor[1] = 0.25;
 	}
-	color[2]=color[3];
-	color[3]=1.;
+	tempColor[2]=tempColor[3];
+	tempColor[3]=1.;
 
 
 	///////////////////////////////////////////////////////////////////////////
@@ -64,39 +66,39 @@
 	// if log10Y>0.6, photopic vision only (with the cones, colors are seen)
 	// else scotopic vision if log10Y<-2 (with the rods, no colors, everything blue),
 	// else mesopic vision (with rods and cones, transition state)
-	if (color[2] <= 0.01)
+	if (tempColor[2] <= 0.01)
 	{
 		// special case for s = 0 (x=0.25, y=0.25)
-		color[2] *= 0.5121445;
-		color[2] = pow(color[2]*pi*0.0001, alphaWaOverAlphaDa*oneOverGamma)* term2TimesOneOverMaxdLpOneOverGamma;
-		color[0] = 0.787077*color[2];
-		color[1] = 0.9898434*color[2];
-		color[2] *= 1.9256125;
-		resultSkyColor = color*brightnessScale;
+		tempColor[2] *= 0.5121445;
+		tempColor[2] = pow(tempColor[2]*pi*0.0001, alphaWaOverAlphaDa*oneOverGamma)* term2TimesOneOverMaxdLpOneOverGamma;
+		tempColor[0] = 0.787077*tempColor[2];
+		tempColor[1] = 0.9898434*tempColor[2];
+		tempColor[2] *= 1.9256125;
+		resultSkyColor = tempColor*brightnessScale;
 	}
 	else
 	{
-		if (color[2]<3.9810717055349722)
+		if (tempColor[2]<3.9810717055349722)
 		{
 			// Compute s, ratio between scotopic and photopic vision
-			float op = (log(color[2])/ln10 + 2.)/2.6;
+			float op = (log(tempColor[2])/ln10 + 2.)/2.6;
 			float s = op * op *(3. - 2. * op);
 			// Do the blue shift for scotopic vision simulation (night vision) [3]
 			// The "night blue" is x,y(0.25, 0.25)
-			color[0] = (1. - s) * 0.25 + s * color[0];	// Add scotopic + photopic components
-			color[1] = (1. - s) * 0.25 + s * color[1];	// Add scotopic + photopic components
+			tempColor[0] = (1. - s) * 0.25 + s * tempColor[0];	// Add scotopic + photopic components
+			tempColor[1] = (1. - s) * 0.25 + s * tempColor[1];	// Add scotopic + photopic components
 			// Take into account the scotopic luminance approximated by V [3] [4]
-			float V = color[2] * (1.33 * (1. + color[1] / color[0] + color[0] * (1. - color[0] - color[1])) - 1.68);
-			color[2] = 0.4468 * (1. - s) * V + s * color[2];
+			float V = tempColor[2] * (1.33 * (1. + tempColor[1] / tempColor[0] + tempColor[0] * (1. - tempColor[0] - tempColor[1])) - 1.68);
+			tempColor[2] = 0.4468 * (1. - s) * V + s * tempColor[2];
 		}
 
 		// 2. Adapt the luminance value and scale it to fit in the RGB range [2]
-		// color[2] = std::pow(adaptLuminanceScaled(color[2]), oneOverGamma);
-		color[2] = pow(color[2]*pi*0.0001, alphaWaOverAlphaDa*oneOverGamma)* term2TimesOneOverMaxdLpOneOverGamma;
+		// tempColor[2] = std::pow(adaptLuminanceScaled(tempColor[2]), oneOverGamma);
+		tempColor[2] = pow(tempColor[2]*pi*0.0001, alphaWaOverAlphaDa*oneOverGamma)* term2TimesOneOverMaxdLpOneOverGamma;
 
 		// Convert from xyY to XZY
 		// Use a XYZ to Adobe RGB (1998) matrix which uses a D65 reference white
-		mediump vec3 tmp = vec3(color[0] * color[2] / color[1], color[2], (1. - color[0] - color[1]) * color[2] / color[1]);
+		mediump vec3 tmp = vec3(tempColor[0] * tempColor[2] / tempColor[1], tempColor[2], (1. - tempColor[0] - tempColor[1]) * tempColor[2] / tempColor[1]);
 		resultSkyColor = vec4(2.04148*tmp.x-0.564977*tmp.y-0.344713*tmp.z, -0.969258*tmp.x+1.87599*tmp.y+0.0415557*tmp.z, 0.0134455*tmp.x-0.118373*tmp.y+1.01527*tmp.z, 1.);
 		resultSkyColor*=brightnessScale;
 	}

=== modified file 'doc/codingConventions.doxygen'
--- doc/codingConventions.doxygen	2012-04-29 12:13:30 +0000
+++ doc/codingConventions.doxygen	2012-08-30 16:29:19 +0000
@@ -20,9 +20,7 @@
 /*!
 
 @page codingStyle Coding Style Conventions in Stellarium
-
 @tableofcontents
-
 The increasing number of contributors require that we clearly define coding rules and guidelines. Although for historical reasons the current code of Stellarium does not always comply to these rules, they should now be respected for any addition or modification of the code.
 
 @section stylistic_conventions_sec Stylistic Conventions

=== modified file 'doc/doc-header.html'
--- doc/doc-header.html	2011-08-03 17:51:45 +0000
+++ doc/doc-header.html	2012-08-30 16:29:19 +0000
@@ -19,6 +19,7 @@
  <a href="codingStyle.html">Coding Style</a>&nbsp;&middot;
  <a href="scripting.html">Scripting</a>&nbsp;&middot;
  <a href="plugins.html">Plugins</a>&nbsp;&middot;
+ <a href="renderer.html">Renderer</a>&nbsp;&middot;
  <a href="fileStructure.html">File Structure</a>
 </td>
 </tr>

=== added file 'doc/images/renderer-api-overview.png'
Binary files doc/images/renderer-api-overview.png	1970-01-01 00:00:00 +0000 and doc/images/renderer-api-overview.png	2012-08-30 16:29:19 +0000 differ
=== added file 'doc/images/renderer-implementation-overview.png'
Binary files doc/images/renderer-implementation-overview.png	1970-01-01 00:00:00 +0000 and doc/images/renderer-implementation-overview.png	2012-08-30 16:29:19 +0000 differ
=== modified file 'doc/images/stellarium-architecture.png'
Binary files doc/images/stellarium-architecture.png	2010-04-18 21:00:25 +0000 and doc/images/stellarium-architecture.png	2012-08-30 16:29:19 +0000 differ
=== modified file 'doc/mainpage.doxygen'
--- doc/mainpage.doxygen	2012-04-29 12:13:30 +0000
+++ doc/mainpage.doxygen	2012-08-30 16:29:19 +0000
@@ -28,13 +28,39 @@
 
 @section architecture_sec Program Architecture
 
-The code of Stellarium is split into several main blocks:
-<ul>
-<li>the main loop and main widget classes StelMainWindow, StelMainGraphicsView and StelAppGraphicsScene. Those classes have a single instance which is created at startup by the ::main() function. They perform various tasks such as the creation of the main program window and openGL context, the creation of the stellarium core, the creation of the GUI. After initialization, they manage user's input event propagation and event loop. There are heavily based on %Qt features.</li>
-<li>the core which provides a number of generic services and features to the other components. The main class is the StelApp singleton class which is used everywhere in the code to access other elements. It is the StelApp instance which creates all the main core services and modules at initialization. Example services are OpenGL textures management with the StelTextureMgr, font management with the StelFontMgr, sky images management (images which have a fixed position in the sky) with the StelSkyImageMgr etc.. Two especially important manager classes (the ones with the "Mgr" suffix) are the StelModuleMgr and StelCore classes: the first one manages the collection of StelModule instances which are registered in the program (see next point for more info on what a StelModule is). The second one provides performance critical features for rendering various elements using openGL, or for computing coordinate transformation and other mathematical services.</li>
-<li>a collection of StelModule instances which display the main elements of the program such as planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many components of Stellarium derive from the StelModule class, it is possible for the main loop to treat them generically by calling their standard methods such StelModule::update() and StelModule::draw() at each program iteration. It also allows other program components to access them by name. StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating @ref plugins.</li>
-<li>the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are rendered directly in the openGL window. Users actions trigger signals which are connected to core and StelModules slots.</li>
-<li>the script engine (StelScriptMgr) allows scripts to calls slots from the core and StelModules slots.</li>
+The code of Stellarium is split into several main blocks: <ul>
+
+<li> the main loop and main widget classes StelMainWindow, StelMainGraphicsView and
+StelAppGraphicsWidget.  Those classes have a single instance created at startup by the ::main()
+function.  They perform tasks such as creating of the main window and renderer, creating the
+stellarium core, creating the GUI. After initialization, they manage user's input event
+propagation and event loop. They are heavily based on %Qt features.  </li>
+
+<li> the core which provides generic services and features to the other components.  The main
+class is the StelApp singleton which is used everywhere in the code to access other elements.
+The StelApp instance creates all the main core services and modules at initialization.  Example
+services are sky layer management (e.g. images which have a fixed position in the sky) with the
+StelSkyLayerMgr, drawing with StelRenderer etc. . Two especially important manager classes are
+the StelModuleMgr and StelCore: the former manages the collection of StelModule instances
+registered in the program (see next point for more info on what a StelModule is). The latter
+provides performance critical features for computing coordinate transformation and other
+mathematical services.  </li>
+
+<li> a collection of StelModule instances which display the main elements of the program such as
+planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many
+Stellarium components derive from the StelModule class, the main loop is able to treat them
+generically by calling their standard methods such StelModule::update() and StelModule::draw()
+at each program iteration. This also allows other program components to access them by name.
+StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating
+@ref plugins.  </li>
+
+<li> the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are
+rendered directly in the graphics window. User actions trigger signals connected to core and
+StelModules slots.  </li>
+
+<li> the script engine (StelScriptMgr) allows scripts to calls slots from the core and
+StelModule slots.  </li>
+
 </ul>
 @image html stellarium-architecture.png
 

=== added file 'doc/renderer-api-overview.svg'
--- doc/renderer-api-overview.svg	1970-01-01 00:00:00 +0000
+++ doc/renderer-api-overview.svg	2012-08-30 16:29:19 +0000
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="744.09448"
+   id="svg3265"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="api-overview.svg"
+   inkscape:export-filename="/home/kiith-sa/Programming/stellarium/doc/images/api-overview.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3267">
+    <marker
+       inkscape:stockid="EmptyDiamondL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyDiamondL"
+       style="overflow:visible">
+      <path
+         id="path9879"
+         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8)" />
+    </marker>
+    <linearGradient
+       id="linearGradient9420"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop9422" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8650"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8652" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Tail"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Tail"
+       style="overflow:visible">
+      <g
+         id="g4852"
+         transform="scale(-1.2)">
+        <path
+           id="path4854"
+           d="M -3.8048674,-3.9585227 L 0.54352094,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+        <path
+           id="path4856"
+           d="M -1.2866832,-3.9585227 L 3.0617053,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+        <path
+           id="path4858"
+           d="M 1.3053582,-3.9585227 L 5.6537466,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+        <path
+           id="path4860"
+           d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+        <path
+           id="path4862"
+           d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+        <path
+           id="path4864"
+           d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleInL"
+       style="overflow:visible">
+      <path
+         id="path4967"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(-0.8) translate(-6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleOutL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4976"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(-6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="SemiCircleOut"
+       style="overflow:visible">
+      <path
+         id="path4997"
+         d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.6) translate(7.125493,0.763446)" />
+    </marker>
+    <marker
+       inkscape:stockid="CurveOut"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="CurveOut"
+       style="overflow:visible">
+      <path
+         id="path5003"
+         d="M -5.4129913,-5.0456926 C -2.6529913,-5.0456926 -0.41299131,-2.8056926 -0.41299131,-0.045692580 C -0.41299131,2.7143074 -2.6529913,4.9543074 -5.4129913,4.9543074"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Scissors"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Scissors"
+       style="overflow:visible">
+      <path
+         id="schere"
+         d="M 9.0898857,-3.6061018 C 8.1198849,-4.7769976 6.3697607,-4.7358294 5.0623558,-4.2327734 L -3.1500488,-1.1548705 C -5.5383421,-2.4615840 -7.8983361,-2.0874077 -7.8983361,-2.7236578 C -7.8983361,-3.2209742 -7.4416699,-3.1119800 -7.5100293,-4.4068519 C -7.5756648,-5.6501286 -8.8736064,-6.5699315 -10.100428,-6.4884954 C -11.327699,-6.4958500 -12.599867,-5.5553341 -12.610769,-4.2584343 C -12.702194,-2.9520479 -11.603560,-1.7387447 -10.304005,-1.6532027 C -8.7816644,-1.4265411 -6.0857470,-2.3487593 -4.8210600,-0.082342643 C -5.7633447,1.6559151 -7.4350844,1.6607341 -8.9465707,1.5737277 C -10.201445,1.5014928 -11.708664,1.8611256 -12.307219,3.0945882 C -12.885586,4.2766744 -12.318421,5.9591904 -10.990470,6.3210002 C -9.6502788,6.8128279 -7.8098011,6.1912892 -7.4910978,4.6502760 C -7.2454393,3.4624530 -8.0864637,2.9043186 -7.7636052,2.4731223 C -7.5199917,2.1477623 -5.9728246,2.3362771 -3.2164999,1.0982979 L 5.6763468,4.2330688 C 6.8000164,4.5467672 8.1730685,4.5362646 9.1684433,3.4313614 L -0.051640930,-0.053722219 L 9.0898857,-3.6061018 z M -9.2179159,-5.5066058 C -7.9233569,-4.7838060 -8.0290767,-2.8230356 -9.3743431,-2.4433169 C -10.590861,-2.0196559 -12.145370,-3.2022863 -11.757521,-4.5207817 C -11.530373,-5.6026336 -10.104134,-6.0014137 -9.2179159,-5.5066058 z M -9.1616516,2.5107591 C -7.8108215,3.0096239 -8.0402087,5.2951947 -9.4138723,5.6023681 C -10.324932,5.9187072 -11.627422,5.4635705 -11.719569,4.3902287 C -11.897178,3.0851737 -10.363484,1.9060805 -9.1616516,2.5107591 z "
+         style="fill:#000000;" />
+    </marker>
+    <marker
+       inkscape:stockid="Legs"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Legs"
+       style="overflow:visible">
+      <g
+         id="g5015"
+         transform="scale(-0.7)">
+        <g
+           id="g5017"
+           transform="matrix(0,-1.000000,-1.000000,0,20.70862,21.31391)">
+          <path
+             id="path5019"
+             d="M 21.221250,20.675360 C 14.311099,25.396517 18.766725,27.282204 15.380179,34.118595"
+             style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt" />
+          <path
+             id="path5021"
+             d="M 21.398110,20.548120 C 20.037601,28.895644 24.934182,29.318060 25.903151,34.373078"
+             style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt" />
+        </g>
+        <path
+           id="path5023"
+           d="M -14.090070,-6.7318716 L -15.012238,-2.6884886 L -11.049487,-3.9115586 L -14.090070,-6.7318716 z "
+           style="fill:#030300;fill-rule:evenodd;stroke-width:1.0000000pt" />
+        <path
+           id="path5025"
+           d="M -15.215679,4.5567534 L -13.341552,8.2563664 L -11.074678,4.7835114 L -15.215679,4.5567534 z "
+           style="fill:#030300;fill-rule:evenodd;stroke-width:1.0000000pt" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="CurveIn"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="CurveIn"
+       style="overflow:visible">
+      <path
+         id="path5000"
+         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;fill:none"
+         transform="scale(0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyDiamondLstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyDiamondLstart"
+       style="overflow:visible">
+      <path
+         id="path4931"
+         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(7,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4834"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path4816"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4819"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="611.81556"
+     inkscape:cy="403.85116"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1385"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4630"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3270">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-308.2677)">
+    <rect
+       style="fill:#000000;fill-opacity:0.1254902"
+       id="rect8829"
+       width="1050"
+       height="570"
+       x="0"
+       y="482.36218" />
+    <rect
+       style="fill:#00ff00;fill-opacity:0.1254902"
+       id="rect8771"
+       width="460"
+       height="120"
+       x="10"
+       y="522.36218" />
+    <rect
+       style="fill:#00ff00;fill-opacity:0.1254902"
+       id="rect8773"
+       width="460"
+       height="30"
+       x="10"
+       y="522.36218" />
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="70"
+       y="549.36169"
+       id="text8775"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="70"
+         y="549.36169"
+         id="tspan8779">Renderer API extensions</tspan></text>
+    <rect
+       id="rect7204"
+       width="1030"
+       height="390"
+       x="10"
+       y="652.36218"
+       style="fill:#0000ff;fill-opacity:0.1254902" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.1254902"
+       id="rect8749"
+       width="1030"
+       height="30"
+       x="10"
+       y="652.36218" />
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="400"
+       y="679.36169"
+       id="text8751"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan8753"
+         x="400"
+         y="679.36169">Main Renderer API</tspan></text>
+    <g
+       id="g4775"
+       transform="translate(-290,280)">
+      <rect
+         y="692.36218"
+         x="380"
+         height="30"
+         width="190"
+         id="rect4693"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8908"><flowRegion
+           id="flowRegion8910"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4693"
+             id="use8912"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8914">StelIndexBuffer</flowPara></flowRoot>    </g>
+    <g
+       id="g4782"
+       transform="translate(320,170)">
+      <rect
+         y="802.36218"
+         x="440"
+         height="30"
+         width="200"
+         id="rect4695"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8900"><flowRegion
+           id="flowRegion8902"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4695"
+             id="use8904"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8906">StelGLSLShader</flowPara></flowRoot>    </g>
+    <g
+       id="g4789"
+       transform="translate(190,-130)">
+      <rect
+         y="892.36218"
+         x="520"
+         height="30"
+         width="190"
+         id="rect4697"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8892"><flowRegion
+           id="flowRegion8894"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4697"
+             id="use8896"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8898">StelTextureNew</flowPara></flowRoot>    </g>
+    <g
+       id="g4796"
+       transform="translate(-670,70)">
+      <rect
+         y="492.36218"
+         x="770"
+         height="30"
+         width="260"
+         id="rect4699"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8951"><flowRegion
+           id="flowRegion8953"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4699"
+             id="use8955"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8957">StelGeometryBuilder</flowPara></flowRoot>    </g>
+    <g
+       id="g4803"
+       transform="translate(-690,200)">
+      <rect
+         y="402.36218"
+         x="790"
+         height="30"
+         width="270"
+         id="rect4701"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8916"><flowRegion
+           id="flowRegion8918"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4701"
+             id="use8920"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8922">StelCircleArcRenderer</flowPara></flowRoot>    </g>
+    <g
+       id="g4761"
+       transform="translate(100,280)">
+      <rect
+         y="432.36218"
+         x="340"
+         height="30"
+         width="160"
+         id="rect4751"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <flowRoot
+         xml:space="preserve"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         id="flowRoot8876"><flowRegion
+           id="flowRegion8878"><use
+             x="0"
+             y="0"
+             xlink:href="#rect4751"
+             id="use8880"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara8882">StelRenderer</flowPara></flowRoot>    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-mid:none;marker-end:none"
+       d="m 230,762.36218 0,-40 210,0"
+       id="path4810"
+       inkscape:connector-curvature="0" />
+    <flowRoot
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       id="flowRoot8055"
+       transform="translate(20,158.1017)"><flowRegion
+         id="flowRegion8057"><use
+           x="0"
+           y="0"
+           xlink:href="#path4810"
+           id="use8059"
+           width="1052.3622"
+           height="744.09448"
+           transform="translate(-10,-154.0392)" /></flowRegion><flowPara
+         id="flowPara8061">constructs</flowPara></flowRoot>    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 8;stroke-dashoffset:0;marker-start:url(#Arrow1Lstart);marker-end:none"
+       d="m 860,972.36218 0,-40 -330,0 0,-190 0,0"
+       id="path8283"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-mid:none;marker-end:url(#Arrow1Lend)"
+       d="m 600,722.36218 200,0 0,40"
+       id="path5668"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="710"
+       y="742.36218"
+       id="text5670"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5672"
+         x="710"
+         y="742.36218">constructs</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="420"
+       y="922.36218"
+       id="text5686"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="420"
+         y="922.36218"
+         id="tspan5690">constructs</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 510,434.09448 0,190 -330,0 0,40"
+       id="path6987"
+       inkscape:connector-curvature="0"
+       transform="translate(0,308.2677)"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:#000000;fill-opacity:0.1254902"
+       id="rect8852"
+       width="1050"
+       height="30"
+       x="0"
+       y="482.36218" />
+    <text
+       xml:space="preserve"
+       style="font-size:32.00026321px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="420.00293"
+       y="509.35849"
+       id="text8854"
+       sodipodi:linespacing="125%"
+       transform="scale(0.999993,1.000007)"><tspan
+         sodipodi:role="line"
+         x="420.00293"
+         y="509.35849"
+         id="tspan8858">Renderer API</tspan></text>
+    <g
+       id="g8943"
+       transform="translate(110,20)">
+      <rect
+         y="742.36218"
+         x="20"
+         height="30"
+         width="200"
+         id="rect4659"
+         style="fill:#000000;fill-opacity:0.15686275" />
+      <g
+         id="g8937">
+        <flowRoot
+           xml:space="preserve"
+           style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+           id="flowRoot8929"><flowRegion
+             id="flowRegion8931"><use
+               x="0"
+               y="0"
+               xlink:href="#rect4659"
+               id="use8933"
+               width="1052.3622"
+               height="744.09448" /></flowRegion><flowPara
+             id="flowPara8935">StelVertexBuffer</flowPara></flowRoot>      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 470,274.09448 50,0 0,70"
+       id="path8978"
+       inkscape:connector-curvature="0"
+       transform="translate(0,308.2677)" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="480"
+       y="602.36218"
+       id="text9410"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="480"
+         y="602.36218"
+         id="tspan9414">uses</tspan></text>
+    <rect
+       style="fill:#ffff00;fill-opacity:0.1254902;stroke:none"
+       id="rect9530"
+       width="1050"
+       height="120"
+       x="0"
+       y="312.36218" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:25.90816879000000128;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none"
+       id="rect9418"
+       width="1024.092"
+       height="94.091827"
+       x="12.954084"
+       y="325.31625" />
+    <flowRoot
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       id="flowRoot9544"
+       transform="translate(0,31.796903)"><flowRegion
+         id="flowRegion9546"><use
+           x="0"
+           y="0"
+           xlink:href="#rect9530"
+           id="use9548"
+           width="1052.3622"
+           height="744.09448" /></flowRegion><flowPara
+         id="flowPara9550">User code (plugins, modules, core)</flowPara></flowRoot>    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 520,124.09448 0,50"
+       id="path9552"
+       inkscape:connector-curvature="0"
+       transform="translate(0,308.2677)" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="530"
+       y="462.36218"
+       id="text10684"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="530"
+         y="462.36218"
+         id="tspan10688">uses</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="540"
+       y="922.36218"
+       id="text10894"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan10896"
+         x="540"
+         y="922.36218">constructs (if isGLSLSupported() is true)</tspan></text>
+  </g>
+</svg>

=== added file 'doc/renderer-implementation-overview.svg'
--- doc/renderer-implementation-overview.svg	1970-01-01 00:00:00 +0000
+++ doc/renderer-implementation-overview.svg	2012-08-30 16:29:19 +0000
@@ -0,0 +1,835 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="297mm"
+   height="210mm"
+   id="svg11050"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="implementation-overview-2.svg">
+  <defs
+     id="defs11052">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path4071"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path4092"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path4077"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3885"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.2279853"
+     inkscape:cx="380.33865"
+     inkscape:cy="386.971"
+     inkscape:current-layer="layer1"
+     id="namedview11054"
+     showgrid="false"
+     units="mm"
+     inkscape:window-width="2560"
+     inkscape:window-height="1385"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11083"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata11056">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g11633"
+       transform="translate(160,270)">
+      <rect
+         y="194.09448"
+         x="250"
+         height="30"
+         width="230"
+         id="rect11595"
+         style="fill:#ff0000;fill-opacity:0.25098039;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11601"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11603"><use
+             id="use11605"
+             xlink:href="#rect11595"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11607">StelQGL1Renderer</flowPara></flowRoot>    </g>
+    <g
+       id="g11647"
+       transform="translate(30,170)">
+      <rect
+         y="84.094482"
+         x="390"
+         height="30"
+         width="210"
+         id="rect11085"
+         style="fill:#ff0000;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11617"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11619"><use
+             id="use11621"
+             xlink:href="#rect11085"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11623">StelQGLRenderer</flowPara></flowRoot>    </g>
+    <g
+       id="g11654"
+       transform="translate(30,0)">
+      <rect
+         y="24.094482"
+         x="410"
+         height="30"
+         width="160"
+         id="rect11599"
+         style="fill:#ff0000;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11625"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11627"><use
+             id="use11629"
+             xlink:href="#rect11599"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11631">StelRenderer</flowPara></flowRoot>      <path
+         style="fill:none;stroke:#ff0000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend);stroke-dashoffset:0;marker-start:none"
+         d="m 520,54.094482 0,199.999998"
+         id="path3108"
+         inkscape:connector-curvature="0"
+         transform="translate(-30,0)" />
+      <path
+         style="fill:none;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+         d="m 630,274.09448 10,0 0,170 -120,0 0,20"
+         id="path4883"
+         inkscape:connector-curvature="0"
+         transform="translate(-30,0)"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="g12057"
+       transform="translate(-580,-200)">
+      <g
+         id="g11923">
+        <rect
+           style="fill:#00ff00;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none"
+           id="rect11874"
+           width="200"
+           height="30"
+           x="590"
+           y="264.09448" />
+        <g
+           id="g11909">
+          <flowRoot
+             id="flowRoot11901"
+             style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+             xml:space="preserve"><flowRegion
+               id="flowRegion11903"><use
+                 id="use11905"
+                 xlink:href="#rect11874"
+                 y="0"
+                 x="0"
+                 width="1052.3622"
+                 height="744.09448" /></flowRegion><flowPara
+               id="flowPara11907">StelGLSLShader</flowPara></flowRoot>        </g>
+      </g>
+    </g>
+    <g
+       id="g12066"
+       transform="translate(-580,290)">
+      <rect
+         y="324.09448"
+         x="600"
+         height="30"
+         width="250"
+         id="rect11876"
+         style="fill:#00ff00;fill-opacity:0.25098039;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11931"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11933"><use
+             id="use11935"
+             xlink:href="#rect11876"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11937">StelQGLGLSLShader</flowPara></flowRoot>    </g>
+    <g
+       id="g12073"
+       transform="translate(-10,-300)">
+      <rect
+         y="364.09448"
+         x="630"
+         height="30"
+         width="190"
+         id="rect11878"
+         style="fill:#00ffff;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11939"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11941"><use
+             id="use11943"
+             xlink:href="#rect11878"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11945">StelIndexBuffer</flowPara></flowRoot>    </g>
+    <g
+       id="g12080"
+       transform="translate(30,-100)">
+      <rect
+         y="394.09448"
+         x="620"
+         height="30"
+         width="240"
+         id="rect11880"
+         style="fill:#00ffff;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11947"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11949"><use
+             id="use11951"
+             xlink:href="#rect11880"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11953">StelQGLIndexBuffer</flowPara></flowRoot>    </g>
+    <g
+       id="g12087"
+       transform="translate(-400,-360)">
+      <rect
+         y="424.09448"
+         x="630"
+         height="30"
+         width="190"
+         id="rect11882"
+         style="fill:#0000ff;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11955"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11957"><use
+             id="use11959"
+             xlink:href="#rect11882"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11961">StelTextureNew</flowPara></flowRoot>    </g>
+    <g
+       id="g12094"
+       transform="translate(-440,-330)">
+      <rect
+         y="474.09448"
+         x="640"
+         height="30"
+         width="240"
+         id="rect11884"
+         style="fill:#0000ff;fill-opacity:0.3764706;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11963"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11965"><use
+             id="use11967"
+             xlink:href="#rect11884"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11969">StelTextureBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12101"
+       transform="translate(-570,-250)">
+      <rect
+         y="544.09448"
+         x="680"
+         height="30"
+         width="290"
+         id="rect11886"
+         style="fill:#0000ff;fill-opacity:0.3764706;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11971"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11973"><use
+             id="use11975"
+             xlink:href="#rect11886"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11977">StelQGLTextureBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12108"
+       transform="translate(630,-460)">
+      <g
+         id="g12050">
+        <rect
+           style="fill:#ffff00;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none"
+           id="rect11888"
+           width="200"
+           height="30"
+           x="200"
+           y="524.09448" />
+        <flowRoot
+           xml:space="preserve"
+           style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+           id="flowRoot11979"><flowRegion
+             id="flowRegion11981"><use
+               x="0"
+               y="0"
+               xlink:href="#rect11888"
+               id="use11983"
+               width="1052.3622"
+               height="744.09448" /></flowRegion><flowPara
+             id="flowPara11985">StelVertexBuffer</flowPara></flowRoot>      </g>
+    </g>
+    <g
+       id="g12043"
+       transform="translate(270,-60)">
+      <rect
+         y="394.09448"
+         x="150"
+         height="30"
+         width="210"
+         id="rect11872"
+         style="fill:#ff6000;fill-opacity:0.25098041;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11987"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11989"><use
+             id="use11991"
+             xlink:href="#rect11872"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara11993">StelQGLViewport</flowPara></flowRoot>    </g>
+    <g
+       id="g12116"
+       transform="translate(510,-430)">
+      <rect
+         y="574.09448"
+         x="220"
+         height="30"
+         width="300"
+         id="rect11893"
+         style="fill:#ffff00;fill-opacity:0.3764706;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot11995"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion11997"><use
+             id="use11999"
+             xlink:href="#rect11893"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara12001">StelVertexBufferBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12123"
+       transform="translate(430,-260)">
+      <rect
+         y="614.09448"
+         x="250"
+         height="30"
+         width="350"
+         id="rect11895"
+         style="fill:#ffff00;fill-opacity:0.37647059;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot12003"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion12005"><use
+             id="use12007"
+             xlink:href="#rect11895"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara12009">StelQGLVertexBufferBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12130"
+       transform="translate(370,-150)">
+      <rect
+         y="664.09448"
+         x="290"
+         height="30"
+         width="370"
+         id="rect11897"
+         style="fill:#ffff00;fill-opacity:0.3764706;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.12549020000000000;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot12011"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion12013"><use
+             id="use12015"
+             xlink:href="#rect11897"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara12017">StelQGL1VertexBufferBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12137"
+       transform="translate(330,-90)">
+      <rect
+         y="704.09448"
+         x="330"
+         height="30"
+         width="370"
+         id="rect11899"
+         style="fill:#ffff00;fill-opacity:0.37647059;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none" />
+      <flowRoot
+         id="flowRoot12019"
+         style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion12021"><use
+             id="use12023"
+             xlink:href="#rect11899"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara12025">StelQGL2VertexBufferBackend</flowPara></flowRoot>    </g>
+    <g
+       id="g12217"
+       transform="translate(0,-50)">
+      <rect
+         y="614.09448"
+         x="410"
+         height="30"
+         width="230"
+         id="rect11597"
+         style="fill:#ff0000;fill-opacity:0.25098039;stroke:#000000;stroke-width:0.97894502;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.1254902;stroke-dasharray:none" />
+      <g
+         id="g12211">
+        <flowRoot
+           xml:space="preserve"
+           style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+           id="flowRoot12203"><flowRegion
+             id="flowRegion12205"><use
+               x="0"
+               y="0"
+               xlink:href="#rect11597"
+               id="use12207"
+               width="1052.3622"
+               height="744.09448" /></flowRegion><flowPara
+             id="flowPara12209">StelQGL2Renderer</flowPara></flowRoot>      </g>
+    </g>
+    <path
+       style="fill:none;stroke:#ff0001;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 420,274.09448 -10,0 0,180 -10,0 0,90 120,0 0,20"
+       id="path5069"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 410,584.09448 -270,0 0,30"
+       id="path5255"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 310,174.09448 0,120"
+       id="path5445"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 900,174.09448 0,180"
+       id="path5635"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 900,384.09448 0,130"
+       id="path5823"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Lend)"
+       d="m 1030,374.09448 10,0 0,220 -200,0 0,20"
+       id="path6011"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921260000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 710,94.094482 0,199.999998"
+       id="path6571"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Lend)"
+       d="m 190,94.094482 0,179.999998 -90,0 0,340"
+       id="path6759"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:0.99921260000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 20,704.09448 60,0"
+       id="path7133"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.9992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 20,724.09448 60,0"
+       id="path7321"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16.0001049px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="89.99939"
+       y="707.01392"
+       id="text7509"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0000065,0.99999346)"><tspan
+         sodipodi:role="line"
+         x="89.99939"
+         y="707.01392"
+         id="tspan7513">is parent class of</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="90"
+       y="727.00885"
+       id="text7517"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan7519"
+         x="90"
+         y="727.00885">constructs</tspan></text>
+    <path
+       style="fill:none;stroke:#0000ff;stroke-width:0.9992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 250,704.09448 60,0"
+       id="path7540"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#00ff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 250,724.09448 60,0"
+       id="path7728"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="320"
+       y="707.00928"
+       id="text8288"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="320"
+         y="707.00928"
+         id="tspan8292">wraps (tight wrapper)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="320"
+       y="727.00885"
+       id="text8296"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan8298"
+         x="320"
+         y="727.00885">includes (part of functionality separated into a class)</tspan></text>
+    <path
+       style="fill:none;stroke:#0000ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 320,94.094482 0,49.999998"
+       id="path8319"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#0000ff;stroke-width:0.99921260000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 920,94.094482 0,49.999998"
+       id="path8507"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow1Lend)"
+       d="m 640,584.09448 190,0 0,30"
+       id="path8695"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.9992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 640,484.09448 190,0 0,30"
+       id="path9069"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.9992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 420,264.09448 -40,0 0,30"
+       id="path9259"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.9992126;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
+       d="m 630,264.09448 40,0 0,30"
+       id="path9447"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 440,44.094482 -120,0 0,20"
+       id="path9635"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 600,44.094482 320,0 0,20"
+       id="path9823"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#00ff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 520,284.09448 0,50"
+       id="path10767"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:8,1;stroke-dashoffset:0;marker-end:none;marker-mid:none"
+       d="m 0,4.0944824 1050,0"
+       id="path12409"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path12975"
+       d="m 0,184.09448 1050,0"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none"
+       d="m 0,394.09448 1050,0"
+       id="path12977"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path12979"
+       d="m 0,554.09448 1050,0"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none"
+       d="m 0,654.09448 1050,0"
+       id="path12981"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path12983"
+       d="m 0,104.09448 1050,0"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none" />
+    <g
+       id="g13106"
+       transform="translate(-10,0.0657492)">
+      <rect
+         y="654.09448"
+         x="10"
+         height="30"
+         width="80"
+         id="rect13005"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13007"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13009"><use
+             id="use13011"
+             xlink:href="#rect13005"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13013">Legend</flowPara></flowRoot>    </g>
+    <g
+       id="g13099"
+       transform="translate(-10,0.0657492)">
+      <rect
+         y="554.09448"
+         x="10"
+         height="30"
+         width="50"
+         id="rect12997"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13015"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13017"><use
+             id="use13019"
+             xlink:href="#rect12997"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13021">GL2</flowPara></flowRoot>    </g>
+    <g
+       id="g13092"
+       transform="translate(-10,0)">
+      <rect
+         y="394.09448"
+         x="10"
+         height="30"
+         width="50"
+         id="rect12993"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13023"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13025"><use
+             id="use13027"
+             xlink:href="#rect12993"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13029">GL1 </flowPara></flowRoot>    </g>
+    <g
+       id="g13085"
+       transform="translate(-10,0.0657492)">
+      <rect
+         y="184.09448"
+         x="10"
+         height="30"
+         width="130"
+         id="rect12999"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13031"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13033"><use
+             id="use13035"
+             xlink:href="#rect12999"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13037">GL common</flowPara></flowRoot>    </g>
+    <g
+       id="g13078"
+       transform="translate(-10,0.0657492)">
+      <rect
+         y="104.09448"
+         x="10"
+         height="30"
+         width="180"
+         id="rect13001"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13039"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13041"><use
+             id="use13043"
+             xlink:href="#rect13001"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13045">Abstract backend</flowPara></flowRoot>    </g>
+    <g
+       id="g13071"
+       transform="translate(-10,0.0657492)">
+      <rect
+         y="4.0944824"
+         x="10"
+         height="30"
+         width="40"
+         id="rect13003"
+         style="fill:#000000;fill-opacity:0.0627451;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 1;stroke-dashoffset:0" />
+      <flowRoot
+         id="flowRoot13047"
+         style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><flowRegion
+           id="flowRegion13049"><use
+             id="use13051"
+             xlink:href="#rect13003"
+             y="0"
+             x="0"
+             width="1052.3622"
+             height="744.09448" /></flowRegion><flowPara
+           id="flowPara13053">API</flowPara></flowRoot>    </g>
+  </g>
+</svg>

=== added file 'doc/renderer.doxygen'
--- doc/renderer.doxygen	1970-01-01 00:00:00 +0000
+++ doc/renderer.doxygen	2012-08-30 16:29:19 +0000
@@ -0,0 +1,421 @@
+/*
+ * Stellarium
+ * Copyright (c) 2012 Ferdinand Majerech
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*!
+
+@page renderer Renderer
+
+
+
+@section introduction Introduction
+
+During Google Summer of Code 2012, graphics code was separated into a subsystem
+called Renderer (<code>src/core/renderer</code>).
+
+Renderer is composed of interface classes abstracting away low-level graphics
+work, and backend classes either derived from or used by the interface classes.
+
+This allows to change underlying implementation without rewriting drawing code.
+For example, we now have two sets of backend classes: GL1 and GL2.  Which one
+us used is decided at startup without affecting drawing code.
+
+
+
+@section outline API outline
+
+@image html renderer-api-overview.png
+
+@subsection stelrenderer StelRenderer
+
+The central class of the Renderer subsystem is StelRenderer.  It constructs
+other graphics classes (textures, vertex and index buffers, etc.) and sets
+graphics state (global color, depth test mode, etc.). It also handles drawing.
+There is always only one StelRenderer instance, though it's not a singleton (no
+global access). While the graphics classes are constructed by StelRenderer,
+it's the caller's responsibility to delete them. Also, they must be destroyed
+before StelRenderer (which is destroyed right before the program exits).
+
+For example, to construct a texture (StelTextureNew), call
+StelRenderer::createTexture(), to construct a vertex buffer (StelVertexBuffer),
+call StelRenderer::createVertexBuffer(), and so on. 
+
+Handling construction of graphics classes in StelRenderer allows different
+backends (e.g. GL1, GL2) to construct their own implementations.
+
+@subsection stelvertexbuffer StelVertexBuffer
+
+StelVertexBuffer is a templated array-like container constructed by
+StelRenderer that stores vertices. A vertex is a struct specified by user
+through the template argument; it has to fulfill some requirements (see
+StelVertexBuffer documentation), e.g. it can't have data members that don't
+make sense in a vertex.  Various vertex types are possible; vertex type
+specifies what attributes to use (position, texcoord, color, normal) as well as
+their dimensions.
+
+Before drawing, a vertex buffer must be locked, allowing things like uploading
+vertices to the GPU.  Vertex buffers are drawn using StelRenderer. If possible,
+they should be filled once, locked, and never unlocked again.  Backend might
+then move the vertex data to the GPU, greatly improving performance even if
+some extra vertices are drawn.
+
+@subsection stelindexbuffer StelIndexBuffer
+
+Index buffers can be used with vertex buffers to specify which vertices to
+draw.  For example, a vertex buffer containing a 2D grid might be used with
+many index buffers (one draw per index buffer), each specifying a row of the
+grid as a triangle strip.  StelIndexBuffer API is similar to StelVertexBuffer,
+but it's not templated. There are 2 index types (specified at construction);
+16bit and 32bit. 16bit is faster but only usable with with up to 65535
+vertices.  Again, the buffer must be locked before drawing, and it's best to
+keep it locked for a long time without modifications.
+
+@subsection steltexturenew StelTextureNew
+
+Textures are bound to texture units to be used in following draws.  Textures
+are used only with vertex types that have texture coordinates. By default, only
+the texture bound to the first texture unit is drawn, interpreted as color.
+Shaders can also use other texture units and interpret the texture differently
+(as normals, specularity, etc.).
+
+StelTextureNew is the interface class for textures. StelRenderer never fails to
+construct a texture, but the new texture might be in various states. If loading
+fails, the texture is in "Error" state, and, when bound, a placeholder texture
+is used instead.  Depending on creation parameters, a texture might still be
+loading in background when constructed. It might even wait to start loading
+until the first time it's bound. In this case the placeholder is used until
+loading finishes.
+
+@subsection stelglslshader StelGLSLShader
+
+Shaders are programs running on the GPU that can override default graphics
+functionality. They are usually used for advanced effects such as normal
+mapping, shadows, and so on. Some backends (GL2) might draw everything with
+shaders internally, but default graphics functionality is unchanged.  Graphics
+APIs have different shader languages; for OpenGL, GLSL is used.  There is no
+simple way to abstract this behind a backend-independent interface, so instead
+of a generic "Shader" class, GLSL is used as an optional StelRenderer feature
+that might not be supported by a backend. If ever needed, support for HLSL
+(used by Direct3D) might be implemented in a similar way.
+
+StelGLSLShader is a GLSL shader program class constructed by StelRenderer.  The
+program is composed of vertex and fragment shaders, equivalent to .c files in
+a C program. There must be at least one vertex and one fragment shader.  There
+might be more, which is useful for more complex shaders.  There can only be one
+main() function for vertex shader and one for fragment shader.  Shaders can be
+named, and enabled or disabled by name, allowing for exchangeable modules.
+
+Vertex shaders run once per vertex while fragment shaders run at least once per
+pixel. Keep this in mind; a graphics scene might have 100000 vertices but it
+will likely have many more pixels, e.g. 1920x1080 is roughly 2000000 pixels.
+
+Code using GLSL must be optional as the renderer might not support it. The code
+must first ask StelRenderer if GLSL is supported, if so, use the GLSL-based
+code, and otherwise use a fallback implemented without shaders. For
+non-essential effects, like shadows, disabling the effect without a fallback
+might be enough.
+
+
+@subsection extensions Renderer extension classes
+
+Some graphics functionality is commonly used but can be implemented using
+existing Renderer API. Unless heavy optimizations are needed , this
+functionality should be built on top of other Renderer classes. I call this
+"extensions". The advantage of extensions is that they only depend on the
+public Renderer API, reducing work needed to be done in each backend.
+
+An example is sphere drawing. While StelRenderer could have a "drawSphere"
+member function, adding such functions might result in a difficult to implement
+API.  So instead we have a class that builds sphere vertex/index buffers using
+existing API.
+
+Current extension classes are StelGeometryBuilder and StelCircleArcRenderer.
+The former builds vertex buffers with various geometry to be drawn. The latter
+draws circle arcs, used to display various lines in the sky with correct
+curvature.
+
+
+@section api_philosophy API design philosophy
+
+Renderer is designed with five priorities, in this order:
+
+<ol>
+<li> ease of use (code using Renderer) </li>
+<li> portability (ease of backend implementation) </li>
+<li> maintainability (avoid bug creep, avoid API breaking) </li>
+<li> speed (FPS) </li>
+<li> power (features) </li>
+</ol>
+
+This is not absolute. Portability can trump ease of use; otherwise we'd use
+a plain GL2+ wrapper. Same is true for speed; otherwise we'd have an
+immediate mode style API.
+
+Ease of use is rather obvious. Drawing code should be as simple as possible.
+While some graphics knowledge is required, we should not require mastery of
+OpenGL.
+
+Portability matters as Stellarium runs not only on the PC OS's, but also on
+mobile platforms and maybe even some embedded systems.  Getting a basic backend
+for a new platform to work should be a straightforward, one-week task.
+Eventually, Stellarium will need backends for OpenGL 4+ and OpenGL ES 3.
+A backend should not need to implement hundreds of functions.
+
+Maintainability is close to portability. To be portable, an API should be
+simple, and a simple API will also be more maintainable. Features should not be
+added because they are cool; they should be added when needed.  They should be
+well documented, both API and implementation. Documentation should include code
+examples if possible, and be updated immediately when a feature changes, not
+"when time allows it". Tests should be added when possible; we still need to
+improve this.  Code should be simple first.  Unless it absolutely needs to be
+powerful and/or optimized, it should be easy to read.  100-line functions are
+bad.  1000-line files are unacceptable.
+
+Speed is important as Stellarium is a real-time app. It's not Crysis, so speed
+isn't the main priority, but it's not Crysis, so it shouldn't require high-end
+hardware. Old GPUs should work, as should modern integrated GPUs.  With
+Stellarium's graphics it's viable to support mainstream hardware up to 10 years
+old. That said, speed often conflicts with maintainability. Optimization should
+only be done based on careful profiling and measurable gains.  Adding 1000
+lines to get 0.1 FPS will result in bugs and maybe even slowdown as code rots
+and hardware changes.
+
+The API must be powerful to draw everything Stellarium needs.  However, we
+don't compete in the demoscene; if not adding a feature Stellarium does not
+need will make the API simpler or more portable, we shouldn't add it. For
+example, StelRenderer depth buffer functionality doesn't match OpenGL; it only
+covers the cases we use (with a mechanism to add more if needed).  This
+disallows creating some effects possible with OpenGL, but it is simpler, and
+much easier to emulate on a backend that does not support these particular
+OpenGL features.
+
+
+@section implementation Implementation
+
+@subsection impl_overview Overview
+
+@image html renderer-implementation-overview.png
+
+Currently there are two Renderer backends: QGL1 and QGL2, based on OpenGL 1.1
+and OpenGL 2.1 respectively. They use Qt's QGL classes for things like context
+management and texture upload.  Code common for both versions, like some GL
+state, textures, viewport and vertex array manipulation, is shared between
+these, while code such as fixed-function/shaders and drawing is separate.
+
+The QGL1 backend is designed for compatibility with old hardware; it doesn't
+usually use new features brought by extensions or later GL 1.x versions.  It
+requires GL 1.1 for vertex array support. After Qt5 removes GL 1.x support this
+backend should still work as GL 2.x is backwards compatible with GL 1.x; but
+only on drivers that support GL 2.x . It provides better compatibility/speed
+for older GPUs and buggy drivers.
+
+The QGL2 backend should use GL 2.1 to its fullest, and might even have
+optionally use features from GL 3.x and extensions, but never require them. An
+example is float texture support, which requires GL 3.0 .  It's required for
+advanced effects such as shadows, and obviously for any GLSL based effects.
+It's also likely to be slower than the QGL1 backend.
+
+
+@subsection viewport StelQGLViewport
+
+Manages the viewport. It handles capturing the screen to a texture, screenshots
+and so on. If FBOs are supported and not disabled, custom double buffering
+logic is used allowing to interrupt a frame in progress to increase
+responsiveness, finishing the drawing later.
+
+@subsection vertexbufferbackend StelVertexBufferBackend and implementations
+
+In C++, a templated function can never be virtual; so
+<strong>createVertexBuffer()</strong> functions of StelRenderer implementations
+can't construct objects derived from
+<strong>StelVertexBuffer<SomeVertexType></strong> . To work around this
+limitation without sacrificing its safe templated API StelVertexBuffer wraps
+a non-templated class, StelVertexBufferBackend, from which backend vertex
+buffers are derived.  StelRenderer has an internal virtual function that allows
+its implementations to return a custom vertex buffer backend type.
+
+StelVertexBufferBackend doesn't know the vertex type directly; it uses metadata
+from the VERTEX_ATTRIBUTES macro in the vertex type describing its layout and
+vertex attributes (data members).
+
+Currently, only one vertex buffer backend exists;
+StelQGLArrayVertexBufferBackend, based on vertex arrays where each vertex
+attribute is in a separate array. GL version specific backends
+StelQGL1ArrayVertexBufferBackend and StelQGL2ArrayVertexBufferBackend, used by
+StelQGL1Renderer and StelQGL2Renderer respectively, derive from it, specifying
+drawing logic (fixed function for QGL1 and shaders for QGL2).
+
+@subsection texturebackend StelTextureBackend and implementations
+
+Like StelVertexBuffer, StelTextureNew wraps a backend class;
+StelTextureBackend, from which the each backend derives.  The reason is not
+templating; the API class and backend are separate so the former is owned by
+user code, while the latter might be owned by the renderer backend.  This
+allows for features like texture caching; deleting the frontend decreases
+a reference count of the backend in cache.  Caching is used internally to avoid
+loading the same texture twice. If creating a texture from a previously loaded
+file we can return a cached texture instead, wrapping the same
+StelTextureBackend in a different StelTextureNew. Caching is not mandatory, so
+there might be backends that don't use it.
+
+The only backend right now is StelQGLTextureBackend, used both for GL1 and GL2
+(it's managed by StelQGLRenderer).  It uses Qt functions to load textures with
+some exceptions like loading textures from raw data, when plain GL texture
+functions are used.
+
+@subsection qglglslshader StelQGLGLSLShader
+
+This is the shader backend used by StelQGL2Renderer. It uses QGL to manage
+shaders. All shaders added are stored in compiled form.  When
+<strong>build()</strong> is called, enabled shaders are linked into a shader
+program, but the program is only bound inside StelQGL2Renderer's draw code.
+Linked programs are cached so we never link the same program twice.  Any
+uniforms set are stored in temporary storage and only passed when the
+underlying program is bound.
+
+@subsection rendererbackend StelQGLRenderer, StelQGL1Renderer, StelQGL2Renderer
+
+The GL1 and GL2 backends share much code; this code is in the StelQGLRenderer
+class. This includes text and rectangle drawing, texture management,
+viewport (StelQGLViewport), and so on.
+
+StelQGL1Renderer contains GL1 specific code. This is mostly pre-draw setup
+(drawing is done by StelQGL1ArrayVertexBufferBackend) and various GL1 specific
+state.
+
+StelQGL2Renderer is more complicated. Along with functionality equivalent to
+StelQGL1Renderer, it also manages shaders.  Especially important is swapping of
+default shaders, which emulate a simplified fixed function pipeline with
+specific vertex formats, and custom shaders specified by the user by binding
+a StelGLSLShader.
+
+
+@section implementation_philosophy Implementation philosophy
+
+Implementation is usually secondary to the API (ease of use); it needs to work
+within its constraints. It's not acceptable to break the API just to make
+implementation a bit more convenient. The main priorities of the implementation
+are maintainability and speed. Portability is not much of a concern - we might
+e.g. have a Windows-only Direct3D implementation, as long as we have
+implementations to cover other platforms.  Power and ease of use are determined
+by the API.
+
+Maintainability is often in direct conflict with speed; highly optimized code
+is hard to maintain. There is one way we can deal with this; for any part of
+the subsystem, a simple and readable, not necessarily fast, implementation
+should exist. This can then be used as a reference when writing other
+implementations (for different platforms or for speed) and for testing.
+StelQGLArrayVertexBufferBackend, StelQGLIndexBuffer, StelQGLGLSLShader and
+StelQGLTextureBackend can be considered such references, but they could
+probably be simpler if they should serve exclusively this purpose.
+
+We can also have implementations designed for speed, optimized as much as
+possible. For example, a vertex buffer implementation could internally switch
+between vertex arrays and VBOs based on last time the buffer was updated.
+Complexity is acceptable here as long as it brings speed gains.
+
+The advantage of this approach is that we always have an implementation that
+works and is maintainable. Optimized implementations might be thrown out and
+replaced if maintainability is a problem, but we still have something that
+works.
+
+
+@section usage_patterns Why not singleton & Usage patterns
+
+Unlike other core services, StelRenderer is not directly accessible through
+StelCore, nor is there any way to access it globally. Only one StelRenderer
+exists, but it's not a singleton. Drawing code usually gets a StelRenderer
+through a parameter.  This has more to do with maintainability than ease of
+use; a globally accessible StelRenderer might be easier to use, removing need
+for lazy initialization.
+
+Initialization and destruction of StelRenderer backend happens at well defined
+times and when a StelRenderer pointer is passed to drawing code, it's
+guaranteed to be initialized. Graphics accessing a StelRenderer globally might
+end up using an uninitialized StelRenderer, or, if it was a lazily initialized
+singleton, trigger premature initialization.
+
+In future Renderer could be enhanced to allow switching backends
+post-initialization, even for single frames (e.g. export to document formats).
+This would be more complicated with a global renderer, although the main
+problem here is different - allowing API objects constructed by one renderer to
+work with another.
+
+Finally, the main reason why StelRenderer is not globally accessible is making
+any future (however distant) major rewrites less complicated.  Refactoring
+previous drawing code was made difficult by circular dependencies of various
+parts of code; not in the "include" sense, but in "classes using each other"
+sense. There was no clear point to start - many things had to be refactored
+simultaneously. Removing global accessibility makes dependencies more similar
+to a directed acyclic graph and there are clear points to start changes.
+
+The disadvantage of a non-global StelRenderer is that we can't access it when
+initializing drawing code (unless it's explicitly passed). I.e. we can't load
+our textures when a class using StelRenderer is constructed.  However, we don't
+need to initialize at construction; we only need the drawing objects to be
+ready before drawing. We can initialize them lazily. One way to do this is
+initializing drawing data in a function called during the first draw,setting an
+"initialized" flag, and only letting destructor destroy this data if this flag
+is set. This is less convenient, but it might actually improve performance as
+we only initialize drawing data once we need it.
+
+
+@section future Future development 
+
+
+The Renderer API is quite complete and should be sufficient for some time;
+especially the shader support can be used for various new graphics features.
+However, backend performance, especially the GL2 backend, leaves something to
+be desired. Also, now that all drawing is separated, new debugging and
+profiling features are possible.
+
+One near-term goal is collection of statistics about the backend's operation.
+We should be able to collect data about things such as the number of calls of
+specific functions per frame, triangles/vertices/indices per frame, underlying
+OpenGL draw calls, state changes, etc. . In combination with profiling data
+this should make finding bottlenecks easier. More importantly, it should help
+find inefficiencies in user code, such as plugins, and help plugin authors
+improve performance of their code.
+
+Currently, Renderer backend classes are implemented in a mostly straightforward
+way. We should be able to improve performance by optimizing or adding
+alternative high-performance backends.
+
+A major optimization would be a VBO (vertex buffer object) vertex buffer
+backend.  With VBOs, vertex data is in GPU memory, freeing the bus.  This can
+result in massive performance increase, even an order of magnitude. As the data
+must be stored on the GPU instead of being permanently re-uploaded, this is
+only useful if we have a lot of graphics data that never changes. Otherwise
+performance is likely to drop instead of increasing.  Right now VBOs could help
+with things like planets and models, but the majority of drawing is done by
+StelSkyDrawer (point sources, mostly stars), where vertex data is regenerated
+every frame. Rewriting some StelSkyDrawer users, especially
+BigStarCatalogExtension::ZoneArray, to use static vertex buffers initialized
+once and never modified, would result in more vertices per frame, but it might
+make VBOs viable which would likely bring massive performance boost.  Other
+work currently done on the CPU, such as vertex projection, would also have to
+be done on GPU (this is already done for stereographic projection).
+
+A non-essential, but useful future addition would be the ability to switch
+backends at any time. This would require all StelRenderer constructed classes
+to have separate frontend and backend objects, as StelVertexBuffer and
+StelTextureNew already have, and the frontends would need to store all data
+needed to reconstruct the backends - probably duplicating a lot of data.  If
+a StelRenderer backend would be passed an object constructed by a different
+backend, it would delete the object's backend and replace it with its own.
+*/

=== modified file 'doc/scripting.doxygen'
--- doc/scripting.doxygen	2012-03-16 22:11:30 +0000
+++ doc/scripting.doxygen	2012-08-30 16:29:19 +0000
@@ -29,7 +29,7 @@
 This makes it possible to write small programs within Stellarium to produce 
 presentations, set up custom configurations, and to automate repetitive 
 tasks.  Prior to version 0.10.0, Stellarium used a different scripting engine 
-called @ref StratoScript.
+called @ref stratoscript.
 
 The core scripting language is
 <a href="http://en.wikipedia.org/wiki/ECMAScript">ECMAScript</a>, giving users
@@ -38,7 +38,7 @@
 is done via a collection of objects which represent components of Stellarium
 itself.  See @ref scripting_api for more details.
 
-@section scratoscript StratoScript
+@section stratoscript StratoScript
 
 Prior to version 0.10.0, Stellarium had a simple scripting engine, known as 
 \e StratoScript.  Using \e StratoScript it was possible to record and play back 

=== modified file 'doc/stellarium-architecture.svg'
--- doc/stellarium-architecture.svg	2010-04-18 21:16:11 +0000
+++ doc/stellarium-architecture.svg	2012-08-30 16:29:19 +0000
@@ -13,7 +13,7 @@
    height="744.09448"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
+   inkscape:version="0.48.3.1 r9886"
    version="1.0"
    sodipodi:docname="stellarium-architecture.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -135,12 +135,12 @@
      inkscape:current-layer="layer1"
      width="1052.3622px"
      height="744.09448px"
-     inkscape:window-width="1274"
-     inkscape:window-height="751"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="2560"
+     inkscape:window-height="1385"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      showgrid="false"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -149,7 +149,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -189,66 +189,61 @@
          sodipodi:role="line"
          x="77.209961"
          y="454.34995"
-         id="tspan3142"
-         style="font-size:16px">StelTextureMgr</tspan><tspan
+         id="tspan3144"
+         style="font-size:16px">StelRenderer</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="474.34995"
-         id="tspan3144"
-         style="font-size:16px">StelFontMgr</tspan><tspan
-         sodipodi:role="line"
-         x="77.209961"
-         y="494.34995"
          id="tspan3146"
          style="font-size:16px">StelFileMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
-         y="514.34998"
+         y="494.34995"
          id="tspan3148"
          style="font-size:16px">StelLocaleMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
+         y="514.34998"
+         style="font-size:16px"
+         id="tspan10494">StelAudioMgr</tspan><tspan
+         sodipodi:role="line"
+         x="77.209961"
          y="534.34998"
          style="font-size:16px"
-         id="tspan10494">StelAudioMgr</tspan><tspan
+         id="tspan10498">StelSkyLayerMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="554.34998"
          style="font-size:16px"
-         id="tspan10498">StelSkyImageMgr</tspan><tspan
+         id="tspan10486">StelModuleMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="574.34998"
-         style="font-size:16px"
-         id="tspan10486">StelModuleMgr</tspan><tspan
-         sodipodi:role="line"
-         x="77.209961"
-         y="594.34998"
          id="tspan3152"
          style="font-size:16px">StelSkyCultureMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
+         y="594.34998"
+         style="font-size:16px"
+         id="tspan11513">StelObjectMgr</tspan><tspan
+         sodipodi:role="line"
+         x="77.209961"
          y="614.34998"
          style="font-size:16px"
-         id="tspan11513">StelObjectMgr</tspan><tspan
+         id="tspan2609">StelDownloadMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="634.34998"
          style="font-size:16px"
-         id="tspan2609">StelDownloadMgr</tspan><tspan
+         id="tspan2611">StelLocationMgr</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="654.34998"
          style="font-size:16px"
-         id="tspan2611">StelLocationMgr</tspan><tspan
+         id="tspan2613">...</tspan><tspan
          sodipodi:role="line"
          x="77.209961"
          y="674.34998"
-         style="font-size:16px"
-         id="tspan2613">...</tspan><tspan
-         sodipodi:role="line"
-         x="77.209961"
-         y="694.34998"
          style="font-size:18px"
          id="tspan6340" /></text>
     <rect

=== modified file 'plugins/AngleMeasure/src/AngleMeasure.cpp'
--- plugins/AngleMeasure/src/AngleMeasure.cpp	2012-08-08 09:44:23 +0000
+++ plugins/AngleMeasure/src/AngleMeasure.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelFileMgr.hpp"
@@ -26,10 +25,10 @@
 #include "StelGui.hpp"
 #include "StelGuiItems.hpp"
 #include "StelIniParser.hpp"
-#include "StelVertexArray.hpp"
 #include "AngleMeasure.hpp"
+#include "renderer/StelCircleArcRenderer.hpp"
+#include "renderer/StelRenderer.hpp"
 
-#include <QtOpenGL>
 #include <QDebug>
 #include <QTimer>
 #include <QAction>
@@ -152,63 +151,55 @@
 }
 
 //! Draw any parts on the screen which are for our module
-void AngleMeasure::draw(StelCore* core)
+void AngleMeasure::draw(StelCore* core, StelRenderer* renderer)
 {
 	if (lineVisible.getInterstate() < 0.000001f && messageFader.getInterstate() < 0.000001f)
 		return;
 	
 	const StelProjectorP prj = core->getProjection(StelCore::FrameEquinoxEqu);
-	StelPainter painter(prj);
-	painter.setFont(font);
-	Vec3f tColor, lColor;
-	if (StelApp::getInstance().getVisionModeNight())
-	{
-		tColor = StelUtils::getNightColor(textColor);
-		lColor = StelUtils::getNightColor(lineColor);
-	}
-	else
-	{
-		tColor = textColor;
-		lColor = lineColor;
-	}
+
+	renderer->setFont(font);
+
+	const bool night = StelApp::getInstance().getVisionModeNight();
+	const Vec3f tColor = night ? StelUtils::getNightColor(textColor) : lineColor;
+	const Vec3f lColor = night ? StelUtils::getNightColor(lineColor) : lineColor;
 
 	if (lineVisible.getInterstate() > 0.000001f)
 	{
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glEnable(GL_BLEND);
-		glEnable(GL_TEXTURE_2D);
+		renderer->setBlendMode(BlendMode_Alpha);
 		
 		Vec3d xy;
 		if (prj->project(perp1EndPoint,xy))
 		{
-			painter.setColor(tColor[0], tColor[1], tColor[2], lineVisible.getInterstate());
-			painter.drawText(xy[0], xy[1], angleText, 0, 15, 15);
+			renderer->setGlobalColor(tColor[0], tColor[1], tColor[2],
+			                         lineVisible.getInterstate());
+			renderer->drawText(TextParams(xy[0], xy[1], angleText).shift(15, 15));
 		}
 
-		glDisable(GL_TEXTURE_2D);
-		glEnable(GL_LINE_SMOOTH);
-		glEnable(GL_BLEND);
-		
-		// main line is a great circle		
-		painter.setColor(lColor[0], lColor[1], lColor[2], lineVisible.getInterstate());
-		painter.drawGreatCircleArc(startPoint, endPoint, NULL);
+		renderer->setGlobalColor(lColor[0], lColor[1], lColor[2],
+		                         lineVisible.getInterstate());
+
+		// main line is a great circle
+		StelCircleArcRenderer circleArcRenderer(renderer, prj);
+		circleArcRenderer.drawGreatCircleArc(startPoint, endPoint);
 
 		// End lines
-		painter.drawGreatCircleArc(perp1StartPoint, perp1EndPoint, NULL);
-		painter.drawGreatCircleArc(perp2StartPoint, perp2EndPoint, NULL);
+		circleArcRenderer.drawGreatCircleArc(perp1StartPoint, perp1EndPoint);
+		circleArcRenderer.drawGreatCircleArc(perp2StartPoint, perp2EndPoint);
 	}
 
 	if (messageFader.getInterstate() > 0.000001f)
 	{
-		painter.setColor(tColor[0], tColor[1], tColor[2], messageFader.getInterstate());
+		renderer->setGlobalColor(tColor[0], tColor[1], tColor[2],
+		                         messageFader.getInterstate());
 		int x = 83;
 		int y = 120;
-		int ls = painter.getFontMetrics().lineSpacing();
-		painter.drawText(x, y, messageEnabled);
-		y -= ls;
-		painter.drawText(x, y, messageLeftButton);
-		y -= ls;
-		painter.drawText(x, y, messageRightButton);
+		const int ls = QFontMetrics(font).lineSpacing();
+		renderer->drawText(TextParams(x, y, messageEnabled));
+		y -= ls;
+		renderer->drawText(TextParams(x, y, messageLeftButton));
+		y -= ls;
+		renderer->drawText(TextParams(x, y, messageRightButton));
 	}
 }
 

=== modified file 'plugins/AngleMeasure/src/AngleMeasure.hpp'
--- plugins/AngleMeasure/src/AngleMeasure.hpp	2012-01-11 10:50:37 +0000
+++ plugins/AngleMeasure/src/AngleMeasure.hpp	2012-08-30 16:29:19 +0000
@@ -40,7 +40,7 @@
 	// Methods defined in the StelModule class
 	virtual void init();
 	virtual void update(double deltaTime);
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 	virtual void handleKeys(class QKeyEvent* event);
 	virtual void handleMouseClicks(class QMouseEvent* event);

=== modified file 'plugins/CompassMarks/src/CompassMarks.cpp'
--- plugins/CompassMarks/src/CompassMarks.cpp	2012-08-26 16:11:26 +0000
+++ plugins/CompassMarks/src/CompassMarks.cpp	2012-08-30 16:29:19 +0000
@@ -18,7 +18,6 @@
 
 #include "VecMath.hpp"
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelLocaleMgr.hpp"
@@ -30,8 +29,9 @@
 #include "StelGui.hpp"
 #include "StelGuiItems.hpp"
 #include "StelIniParser.hpp"
+#include "renderer/StelCircleArcRenderer.hpp"
+#include "renderer/StelRenderer.hpp"
 
-#include <QtOpenGL>
 #include <QAction>
 #include <QDebug>
 #include <QPixmap>
@@ -146,27 +146,23 @@
 }
 
 //! Draw any parts on the screen which are for our module
-void CompassMarks::draw(StelCore* core)
+void CompassMarks::draw(StelCore* core, StelRenderer* renderer)
 {
 	if (markFader.getInterstate() <= 0.0) { return; }
 
 	Vec3d pos;
-	StelProjectorP prj = core->getProjection(StelCore::FrameAltAz, StelCore::RefractionOff); // Maybe conflict with Scenery3d branch. AW20120214 No. GZ20120826.
-	StelPainter painter(prj);
-	painter.setFont(font);
-
-	Vec3f mColor;
-	if (StelApp::getInstance().getVisionModeNight())
-		mColor = StelUtils::getNightColor(markColor);
-	else
-		mColor = markColor;
-
-	glColor4f(mColor[0], mColor[1], mColor[2], markFader.getInterstate());
-	glDisable(GL_TEXTURE_2D);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
-	glEnable(GL_LINE_SMOOTH);
-
+	StelProjectorP prj = core->getProjection(StelCore::FrameAltAz, StelCore::RefractionOff); // Maybe conflict with Scenery3d branch. AW20120214 No. GZ20120826.yy
+
+	renderer->setFont(font);
+	const Vec3f mColor = StelApp::getInstance().getVisionModeNight() 
+	                   ? StelUtils::getNightColor(markColor) : markColor;
+
+	renderer->setGlobalColor(mColor[0], mColor[1], mColor[2], markFader.getInterstate());
+	renderer->setBlendMode(BlendMode_Alpha);
+
+	StelCircleArcRenderer circleArcRenderer(renderer, prj);
+	const QFontMetrics fontMetrics(font);
+	
 	for(int i=0; i<360; i++)
 	{
 		float a = i*M_PI/180;
@@ -177,24 +173,17 @@
 			h = -0.02;  // the size of the mark every 15 degrees
 
 			QString s = QString("%1").arg((i+90)%360);
-
-			float shiftx = painter.getFontMetrics().width(s) / 2.;
-			float shifty = painter.getFontMetrics().height() / 2.;
-			painter.drawText(pos, s, 0, -shiftx, shifty);
+			const float shiftx = fontMetrics.width(s) / 2.;
+			const float shifty = fontMetrics.height() / 2.;
+			renderer->drawText(TextParams(pos, prj, s).shift(-shiftx, shifty));
 		}
 		else if (i % 5 == 0)
 		{
 			h = -0.01;  // the size of the mark every 5 degrees
 		}
 
-		glDisable(GL_TEXTURE_2D);
-		painter.drawGreatCircleArc(pos, Vec3d(pos[0], pos[1], h), NULL);		
-		glEnable(GL_TEXTURE_2D);
+		circleArcRenderer.drawGreatCircleArc(pos, Vec3d(pos[0], pos[1], h));
 	}
-	glDisable(GL_LINE_SMOOTH);
-	glDisable(GL_BLEND);
-	glEnable(GL_TEXTURE_2D);
-
 }
 
 void CompassMarks::update(double deltaTime)

=== modified file 'plugins/CompassMarks/src/CompassMarks.hpp'
--- plugins/CompassMarks/src/CompassMarks.hpp	2012-01-11 10:50:37 +0000
+++ plugins/CompassMarks/src/CompassMarks.hpp	2012-08-30 16:29:19 +0000
@@ -39,7 +39,7 @@
 	// Methods defined in the StelModule class
 	virtual void init();
 	virtual void update(double deltaTime);
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 public slots:

=== modified file 'plugins/Exoplanets/src/Exoplanet.cpp'
--- plugins/Exoplanets/src/Exoplanet.cpp	2012-08-08 10:11:01 +0000
+++ plugins/Exoplanets/src/Exoplanet.cpp	2012-08-30 16:29:19 +0000
@@ -18,25 +18,22 @@
 
 #include "Exoplanet.hpp"
 #include "StelObject.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
-#include "StelTexture.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelSkyDrawer.hpp"
+#include "renderer/StelRenderer.hpp"
+#include "renderer/StelTextureNew.hpp"
 
 #include <QTextStream>
 #include <QDebug>
 #include <QVariant>
-#include <QtOpenGL>
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
 
-StelTextureSP Exoplanet::markerTexture;
-
 Exoplanet::Exoplanet(const QVariantMap& map)
 		: initialized(false)
 {
@@ -355,31 +352,33 @@
 	labelsFader.update((int)(deltaTime*1000));
 }
 
-void Exoplanet::draw(StelCore* core, StelPainter& painter)
+void Exoplanet::draw(StelCore* core, StelRenderer* renderer, StelProjectorP projector, 
+                     StelTextureNew* markerTexture)
 {
 	StelSkyDrawer* sd = core->getSkyDrawer();	
 
 	Vec3f color = Vec3f(0.4f,1.2f,0.5f);
 	if (StelApp::getInstance().getVisionModeNight())
 		color = StelUtils::getNightColor(color);
-
-	double mag = getVMagnitude(core, true);
+	const double mag = getVMagnitude(core, true);
 
 	StelUtils::spheToRect(RA, DE, XYZ);
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_ONE, GL_ONE);
-	painter.setColor(color[0], color[1], color[2], 1);
+	renderer->setBlendMode(BlendMode_Add);
+	renderer->setGlobalColor(color[0], color[1], color[2]);
 
 	if (mag <= sd->getLimitMagnitude())
 	{
-
-		Exoplanet::markerTexture->bind();
-		float size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
-		float shift = 5.f + size/1.6f;
+		markerTexture->bind();
+		const float size = getAngularSize(NULL)*M_PI/180.*projector->getPixelPerRadAtCenter();
+		const float shift = 5.f + size/1.6f;
 		if (labelsFader.getInterstate()<=0.f)
 		{
-			painter.drawSprite2dMode(XYZ, 5);
-			painter.drawText(XYZ, designation, 0, shift, shift, false);
+			Vec3d win;
+			if(projector->project(XYZ, win))
+			{
+				renderer->drawTexturedRect(win[0] - 5, win[1] - 5, 10, 10);
+				renderer->drawText(TextParams(XYZ, projector, designation).shift(shift, shift).useGravity());
+			}
 		}
 	}
 }

=== modified file 'plugins/Exoplanets/src/Exoplanet.hpp'
--- plugins/Exoplanets/src/Exoplanet.hpp	2012-08-05 12:24:40 +0000
+++ plugins/Exoplanets/src/Exoplanet.hpp	2012-08-30 16:29:19 +0000
@@ -27,8 +27,7 @@
 #include <QDateTime>
 
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
+#include "StelProjectorType.hpp"
 #include "StelFader.hpp"
 
 typedef struct
@@ -44,7 +43,6 @@
 	int discovered;		//! Exoplanet discovered year
 } exoplanetData;
 
-class StelPainter;
 
 //! @class Exoplanet
 //! A exoplanet object represents one pulsar on the sky.
@@ -101,10 +99,8 @@
 
 	Vec3d XYZ;                         // holds J2000 position	
 
-	static StelTextureSP hintTexture;
-	static StelTextureSP markerTexture;
-
-	void draw(StelCore* core, StelPainter& painter);
+	void draw(StelCore* core, class StelRenderer* renderer, StelProjectorP projector, 
+	          class StelTextureNew* markerTexture);
 
 	//! Variables for description of properties of exoplanets
 	QString designation;			//! The designation of the host star

=== modified file 'plugins/Exoplanets/src/Exoplanets.cpp'
--- plugins/Exoplanets/src/Exoplanets.cpp	2012-08-05 12:35:06 +0000
+++ plugins/Exoplanets/src/Exoplanets.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelGui.hpp"
@@ -25,11 +24,12 @@
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelObjectMgr.hpp"
-#include "StelTextureMgr.hpp"
 #include "StelJsonParser.hpp"
 #include "StelFileMgr.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
+#include "renderer/StelRenderer.hpp"
+#include "renderer/StelTextureNew.hpp"
 #include "LabelMgr.hpp"
 #include "Exoplanets.hpp"
 #include "Exoplanet.hpp"
@@ -47,6 +47,7 @@
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
+#include <QSettings>
 #include <QSharedPointer>
 #include <QStringList>
 #include <QPixmap>
@@ -82,7 +83,14 @@
  Constructor
 */
 Exoplanets::Exoplanets()
-	: flagShowExoplanets(false), OnIcon(NULL), OffIcon(NULL), GlowIcon(NULL), toolbarButton(NULL), progressBar(NULL)
+	: texPointer(NULL)
+	, markerTexture(NULL)
+	, flagShowExoplanets(false)
+	, OnIcon(NULL)
+	, OffIcon(NULL)
+	, GlowIcon(NULL)
+	, toolbarButton(NULL)
+	, progressBar(NULL)
 {
 	setObjectName("Exoplanets");
 	exoplanetsConfigDialog = new ExoplanetsDialog();
@@ -108,8 +116,9 @@
 void Exoplanets::deinit()
 {
 	ep.clear();
-	Exoplanet::markerTexture.clear();
-	texPointer.clear();
+	if(NULL != texPointer)    {delete texPointer;}
+	if(NULL != markerTexture) {delete markerTexture;}
+	texPointer = markerTexture = NULL;
 }
 
 void Exoplanets::update(double) //deltaTime
@@ -149,9 +158,6 @@
 
 		jsonCatalogPath = StelFileMgr::findFile("modules/Exoplanets", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/exoplanets.json";
 
-		texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur2.png");
-		Exoplanet::markerTexture = StelApp::getInstance().getTextureManager().createTexture(":/Exoplanets/exoplanet.png");
-
 		// key bindings and other actions
 		// TRANSLATORS: Title of a group of key bindings in the Help window
 		QString groupName = N_("Plugin Key Bindings");
@@ -218,27 +224,33 @@
 /*
  Draw our module. This should print name of first PSR in the main window
 */
-void Exoplanets::draw(StelCore* core)
+void Exoplanets::draw(StelCore* core, StelRenderer* renderer)
 {
 	if (!flagShowExoplanets)
 		return;
 
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-	StelPainter painter(prj);
-	painter.setFont(font);
+	renderer->setFont(font);
+
+	if(NULL == texPointer)
+	{
+		Q_ASSERT_X(NULL == markerTexture, Q_FUNC_INFO, "Textures need to be created simultaneously");
+		texPointer    = renderer->createTexture("textures/pointeur2.png");
+		markerTexture = renderer->createTexture(":/Exoplanets/exoplanet.png");
+	}
 	
 	foreach (const ExoplanetP& eps, ep)
 	{
 		if (eps && eps->initialized)
-			eps->draw(core, painter);
+			eps->draw(core, renderer, prj, markerTexture);
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
-		drawPointer(core, painter);
+		drawPointer(core, renderer, prj);
 
 }
 
-void Exoplanets::drawPointer(StelCore* core, StelPainter& painter)
+void Exoplanets::drawPointer(StelCore* core, StelRenderer* renderer, StelProjectorP projector)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 
@@ -250,16 +262,15 @@
 
 		Vec3d screenpos;
 		// Compute 2D pos and return if outside screen
-		if (!painter.getProjector()->project(pos, screenpos))
+		if (!projector->project(pos, screenpos))
 			return;
 
 		const Vec3f& c(obj->getInfoColor());
-		painter.setColor(c[0],c[1],c[2]);
+		renderer->setGlobalColor(c[0],c[1],c[2]);
 		texPointer->bind();
-		painter.enableTexture2d(true);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
-		painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, StelApp::getInstance().getTotalRunTime()*40.);
+		renderer->setBlendMode(BlendMode_Alpha);
+		renderer->drawTexturedRect(screenpos[0] - 13.0f, screenpos[1] - 13.0f, 26.0f, 
+		                           26.0f, StelApp::getInstance().getTotalRunTime() * 40.0f);
 	}
 }
 

=== modified file 'plugins/Exoplanets/src/Exoplanets.hpp'
--- plugins/Exoplanets/src/Exoplanets.hpp	2012-06-21 16:40:28 +0000
+++ plugins/Exoplanets/src/Exoplanets.hpp	2012-08-30 16:29:19 +0000
@@ -22,8 +22,6 @@
 #include "StelObjectModule.hpp"
 #include "StelObject.hpp"
 #include "StelFader.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "Exoplanet.hpp"
 #include <QFont>
 #include <QVariantMap>
@@ -37,7 +35,6 @@
 class QSettings;
 class QTimer;
 class ExoplanetsDialog;
-class StelPainter;
 class QPixmap;
 class StelButton;
 
@@ -66,8 +63,9 @@
 	virtual void init();
 	virtual void deinit();
 	virtual void update(double deltaTime);
-	virtual void draw(StelCore* core);
-	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
+	virtual void drawPointer(StelCore* core, class StelRenderer* renderer,
+	                         StelProjectorP projector);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 	///////////////////////////////////////////////////////////////////////////
@@ -181,7 +179,8 @@
 
 	QString jsonCatalogPath;
 
-	StelTextureSP texPointer;
+	StelTextureNew* texPointer;
+	StelTextureNew* markerTexture;
 	QList<ExoplanetP> ep;
 
 	// variables and functions for the updater

=== modified file 'plugins/HelloStelModule/src/HelloStelModule.cpp'
--- plugins/HelloStelModule/src/HelloStelModule.cpp	2010-01-13 11:26:18 +0000
+++ plugins/HelloStelModule/src/HelloStelModule.cpp	2012-08-30 16:29:19 +0000
@@ -17,12 +17,12 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "HelloStelModule.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QDebug>
 
@@ -87,11 +87,10 @@
 /*************************************************************************
  Draw our module. This should print "Hello world!" in the main window
 *************************************************************************/
-void HelloStelModule::draw(StelCore* core)
+void HelloStelModule::draw(StelCore* core, StelRenderer* renderer)
 {
-	StelPainter painter(core->getProjection2d());
-	painter.setColor(1,1,1,1);
-	painter.setFont(font);
-	painter.drawText(300, 300, "Hello World!");
+	renderer->setColor(1, 1, 1, 1);
+	renderer->setFont(font);
+	renderer->drawText(300, 300, "Hello World!")
 }
 

=== modified file 'plugins/HelloStelModule/src/HelloStelModule.hpp'
--- plugins/HelloStelModule/src/HelloStelModule.hpp	2010-05-09 20:49:19 +0000
+++ plugins/HelloStelModule/src/HelloStelModule.hpp	2012-08-30 16:29:19 +0000
@@ -33,7 +33,7 @@
 	// Methods defined in the StelModule class
 	virtual void init();
 	virtual void update(double) {;}
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 private:
 	// Font used for displaying our text

=== modified file 'plugins/LogBook/src/LogBook.cpp'
--- plugins/LogBook/src/LogBook.cpp	2010-06-08 18:21:56 +0000
+++ plugins/LogBook/src/LogBook.cpp	2012-08-30 16:29:19 +0000
@@ -34,7 +34,6 @@
 #include "StelObjectMgr.hpp"
 #include "StelObjectType.hpp"
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelStyle.hpp"
 #include "StelTranslator.hpp"
 
@@ -51,13 +50,6 @@
 #include <QSqlRelationalTableModel>
 #include <QSqlTableModel>
 
-#if defined(__APPLE__) && defined(__MACH__)
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
-#else
-#include <GL/glu.h>	/* Header File For The GLU Library */
-#endif
-
-
 /* ********************************************************************* */
 #if 0
 #pragma mark -
@@ -119,9 +111,8 @@
 	return true;
 }
 
-void LogBook::draw(StelCore* core)
+void LogBook::draw(StelCore* core, class StelRenderer* renderer)
 {
-	StelPainter painter(core->getProjection2d());
 }
 
 double LogBook::getCallOrder(StelModuleActionName actionName) const

=== modified file 'plugins/LogBook/src/LogBook.hpp'
--- plugins/LogBook/src/LogBook.hpp	2010-06-08 18:21:56 +0000
+++ plugins/LogBook/src/LogBook.hpp	2012-08-30 16:29:19 +0000
@@ -48,7 +48,7 @@
 	///////////////////////////////////////////////////////////////////////////
 	// Methods defined in the StelModule class
 	virtual bool configureGui(bool show=true);
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 	//! Returns the module-specific style sheet.
 	//! The main StelStyle instance should be passed.

=== modified file 'plugins/Observability/src/Observability.cpp'
--- plugins/Observability/src/Observability.cpp	2012-08-27 13:29:14 +0000
+++ plugins/Observability/src/Observability.cpp	2012-08-30 16:29:19 +0000
@@ -19,7 +19,6 @@
 #include <QSettings>
 #include <QPixmap>
 #include <QTimer>
-#include <QtOpenGL>
 #include <QString>
 #include <QDebug>
 #include <QAction>
@@ -28,6 +27,7 @@
 #include <QKeyEvent>
 #include <QMouseEvent>
 
+#include "renderer/StelRenderer.hpp"
 #include "StelIniParser.hpp"
 #include "StelProjector.hpp"
 #include "StarMgr.hpp"
@@ -42,9 +42,7 @@
 #include "StelGuiItems.hpp"
 #include "StelMovementMgr.hpp"
 #include "StelFileMgr.hpp"
-#include "StelVertexArray.hpp"
 #include "StelCore.hpp"
-#include "StelPainter.hpp"
 #include "ZoneArray.hpp"
 #include "StelSkyDrawer.hpp"
 #include "Observability.hpp"
@@ -239,7 +237,7 @@
 
 /////////////////////////////////////////////
 // MAIN CODE:
-void Observability::draw(StelCore* core)
+void Observability::draw(StelCore* core, StelRenderer* renderer)
 {
 
 	if (!flagShowObservability) return; // Button is off.
@@ -255,10 +253,10 @@
 	if (core->getCurrentLocation().planetName != "Earth") {return;};
 
 // Set the painter:
-	StelPainter paintresult(core->getProjection2d());
-	paintresult.setColor(fontColor[0],fontColor[1],fontColor[2],1);
+	StelProjectorP projector = core->getProjection2d();
+	renderer->setGlobalColor(fontColor[0],fontColor[1],fontColor[2],1);
 	font.setPixelSize(fontSize);
-	paintresult.setFont(font);
+	renderer->setFont(font);
 
 
 // Get current date, location, and check if there is something selected.
@@ -675,30 +673,30 @@
 
 	if (show_Today) 
 	{
-		paintresult.drawText(xLine, yLine,q_("TODAY:"));
-		paintresult.drawText(xLine+fontSize, yLine-spacing, RS2);
-		paintresult.drawText(xLine+fontSize, yLine-spacing*2, RS1);
-		paintresult.drawText(xLine+fontSize, yLine-spacing*3, Cul);
+		renderer->drawText(TextParams(xLine, yLine,q_(" TODAY:")));
+		renderer->drawText(TextParams(xLine+fontSize, yLine-spacing, RS2));
+		renderer->drawText(TextParams(xLine+fontSize, yLine-spacing*2, RS1));
+		renderer->drawText(TextParams(xLine+fontSize, yLine-spacing*3, Cul));
 		yLine -= spacing2;
 	};
 	
 	if ((isMoon && show_FullMoon) || (!isSun && !isMoon && show_Year)) 
 	{
-		paintresult.drawText(xLine,yLine,q_("THIS YEAR:"));
+		renderer->drawText(TextParams(xLine,yLine," THIS YEAR:"));
 		if (show_Best_Night || show_FullMoon)
 		{
 			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, bestNight);
+			renderer->drawText(TextParams(xLine+fontSize, yLine, bestNight));
 		};
 		if (show_Good_Nights) 
 		{
 			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, ObsRange);
+			renderer->drawText(TextParams(xLine+fontSize, yLine, ObsRange));
 		};
 		if (show_AcroCos) 
 		{
 			yLine -= spacing;
-			paintresult.drawText(xLine+fontSize, yLine, AcroCos);
+			renderer->drawText(TextParams(xLine+fontSize, yLine, AcroCos));
 		};
 
 	};

=== modified file 'plugins/Observability/src/Observability.hpp'
--- plugins/Observability/src/Observability.hpp	2012-08-23 09:21:20 +0000
+++ plugins/Observability/src/Observability.hpp	2012-08-30 16:29:19 +0000
@@ -38,7 +38,7 @@
 	virtual ~Observability();
 	virtual void init();
 	virtual void update(double) {;}
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 

=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2012-07-06 17:00:39 +0000
+++ plugins/Oculars/src/Oculars.cpp	2012-08-30 16:29:19 +0000
@@ -29,13 +29,15 @@
 #include "StelMovementMgr.hpp"
 #include "StelObjectMgr.hpp"
 #include "StelLocaleMgr.hpp"
-#include "StelPainter.hpp"
 #include "StelProjector.hpp"
 #include "StelGui.hpp"
 #include "StelGuiItems.hpp"
 #include "StelMainWindow.hpp"
 #include "StelTranslator.hpp"
 #include "SkyGui.hpp"
+#include "renderer/GenericVertexTypes.hpp"
+#include "renderer/StelGeometryBuilder.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QAction>
 #include <QGraphicsWidget>
@@ -49,12 +51,6 @@
 
 #include <cmath>
 
-#if defined(__APPLE__) && defined(__MACH__)
-#include <OpenGL/glu.h>	/* Header File For The GLU Library */
-#else
-#include <GL/glu.h>	/* Header File For The GLU Library */
-#endif
-
 #ifdef Q_WS_MAC
 extern void qt_set_sequence_auto_mnemonic(bool b);
 #endif
@@ -228,10 +224,10 @@
 }
 
 //! Draw any parts on the screen which are for our module
-void Oculars::draw(StelCore* core)
+void Oculars::draw(StelCore* core, StelRenderer* renderer)
 {
 	if (flagShowTelrad) {
-		paintTelrad();
+		paintTelrad(renderer);
 	} else if (flagShowOculars){
 		// Ensure there is a selected ocular & telescope
 		if (selectedCCDIndex > ccds.count()) {
@@ -255,37 +251,33 @@
 		
 		if (ready) {
 			if (selectedOcularIndex > -1) {
-				paintOcularMask();
+				paintOcularMask(renderer);
 				if (flagShowCrosshairs)  {
-					paintCrosshairs();
+					paintCrosshairs(renderer);
 				}
 			}
 			if (guiPanelEnabled)
 			{
 				// Reset the state to allow the panel to be painted normally
-				glDisable(GL_TEXTURE_2D);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-				glEnable(GL_BLEND);
+				renderer->setBlendMode(BlendMode_Alpha);
 			}
 			else
 			{
 				// Paint the information in the upper-right hand corner
-				paintText(core);
+				paintText(core, renderer);
 			}
 		}
 	} else if (flagShowCCD) {
-		paintCCDBounds();
+		paintCCDBounds(renderer);
 		if (guiPanelEnabled)
 		{
 			// Reset the state to allow the panel to be painted normally
-			glDisable(GL_TEXTURE_2D);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glEnable(GL_BLEND);
+			renderer->setBlendMode(BlendMode_Alpha);
 		}
 		else
 		{
 			// Paint the information in the upper-right hand corner
-			paintText(core);
+			paintText(core, renderer);
 		}
 	}
 }
@@ -1293,73 +1285,96 @@
 	return binocularFound;
 }
 
-void Oculars::paintCCDBounds()
+void Oculars::paintCCDBounds(StelRenderer* renderer)
 {
 	StelCore *core = StelApp::getInstance().getCore();
 	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
 
-	glDisable(GL_BLEND);
-	glColor3f(0.f,0.f,0.f);
-	glPushMatrix();
-	glTranslated(params.viewportCenter[0], params.viewportCenter[1], 0.0);
-	glRotated(ccdRotationAngle, 0.0, 0.0, 1.0);
-	GLdouble screenFOV = params.fov;
+	renderer->setBlendMode(BlendMode_None);
+
+	StelVertexBuffer<VertexP2>* vertices =
+		renderer->createVertexBuffer<VertexP2>(PrimitiveType_LineStrip);
+
+	double screenFOV = params.fov;
+	const Vec2f offset = Vec2f(params.viewportCenter[0], params.viewportCenter[1]);
 
 	// draw sensor rectangle
 	if(selectedCCDIndex != -1) {
 		CCD *ccd = ccds[selectedCCDIndex];
 		if (ccd) {
-			glColor4f(0.77, 0.14, 0.16, 0.5);
+			renderer->setGlobalColor(0.77f, 0.14f, 0.16f, 0.5f);
 			Telescope *telescope = telescopes[selectedTelescopeIndex];
-			double ccdXRatio = ccd->getActualFOVx(telescope) / screenFOV;
-			double ccdYRatio = ccd->getActualFOVy(telescope) / screenFOV;
+			const double ccdXRatio = ccd->getActualFOVx(telescope) / screenFOV;
+			const double ccdYRatio = ccd->getActualFOVy(telescope) / screenFOV;
 			// As the FOV is based on the narrow aspect of the screen, we need to calculate
 			// height & width based soley off of that dimension.
 			int aspectIndex = 2;
 			if (params.viewportXywh[2] > params.viewportXywh[3]) {
 				aspectIndex = 3;
 			}
-			float width = params.viewportXywh[aspectIndex] * ccdYRatio;
-			float height = params.viewportXywh[aspectIndex] * ccdXRatio;
-
-			if (width > 0.0 && height > 0.0) {
-				glBegin(GL_LINE_LOOP);
-				glVertex2f(-width / 2.0, height / 2.0);
-				glVertex2f(width / 2.0, height / 2.0);
-				glVertex2f(width / 2.0, -height / 2.0);
-				glVertex2f(-width / 2.0, -height / 2.0);
-				glEnd();
+			const float halfWidth  = 0.5f * (params.viewportXywh[aspectIndex] * ccdYRatio);
+			const float halfHeight = 0.5f * (params.viewportXywh[aspectIndex] * ccdXRatio);
+
+			if (halfWidth > 0.0 && halfHeight > 0.0) 
+			{
+				const float s = sin(-ccdRotationAngle * M_PI / 180.0f);
+				const float c = cos(-ccdRotationAngle * M_PI / 180.0f);
+				const float cosHalfWidth  = c * halfWidth;
+				const float sinHalfWidth  = s * halfWidth;
+				const float cosHalfHeight = c * halfHeight;
+				const float sinHalfHeight = s * halfHeight;
+				const Vec2f v1 = Vec2f(-cosHalfWidth - sinHalfHeight, -sinHalfWidth + cosHalfHeight);
+				const Vec2f v2 = Vec2f(cosHalfWidth  - sinHalfHeight, sinHalfWidth  + cosHalfHeight);
+				const Vec2f v3 = Vec2f(cosHalfWidth  + sinHalfHeight, sinHalfWidth  - cosHalfHeight);
+				const Vec2f v4 = Vec2f(-cosHalfWidth + sinHalfHeight, -sinHalfWidth - cosHalfHeight);
+				vertices->addVertex(VertexP2(offset + v1));
+				vertices->addVertex(VertexP2(offset + v2));
+				vertices->addVertex(VertexP2(offset + v3));
+				vertices->addVertex(VertexP2(offset + v4));
+				vertices->addVertex(VertexP2(offset + v1));
+				vertices->lock();
+
+				renderer->drawVertexBuffer(vertices);
 			}
 		}
 	}
-
-	glPopMatrix();
+	delete vertices;
 }
 
-void Oculars::paintCrosshairs()
+void Oculars::paintCrosshairs(StelRenderer* renderer)
 {
 	const StelProjectorP projector = StelApp::getInstance().getCore()->getProjection(StelCore::FrameEquinoxEqu);
 	StelCore *core = StelApp::getInstance().getCore();
 	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
 	// Center of screen
 	Vec2i centerScreen(projector->getViewportPosX()+projector->getViewportWidth()/2,
-					   projector->getViewportPosY()+projector->getViewportHeight()/2);
-	GLdouble length = 0.5 * params.viewportFovDiameter;
+	                   projector->getViewportPosY()+projector->getViewportHeight()/2);
+	double length = 0.5 * params.viewportFovDiameter;
 	// See if we need to scale the length
 	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->appearentFOV() > 0.0) {
 		length = oculars[selectedOcularIndex]->appearentFOV() * length / maxEyepieceAngle;
 	}
 
 	// Draw the lines
-	StelPainter painter(projector);
-	painter.setColor(0.77, 0.14, 0.16, 1);
-	painter.drawLine2d(centerScreen[0], centerScreen[1], centerScreen[0], centerScreen[1] + length);
-	painter.drawLine2d(centerScreen[0], centerScreen[1], centerScreen[0], centerScreen[1] - length);
-	painter.drawLine2d(centerScreen[0], centerScreen[1], centerScreen[0] + length, centerScreen[1]);
-	painter.drawLine2d(centerScreen[0], centerScreen[1], centerScreen[0] - length, centerScreen[1]);
+	renderer->setGlobalColor(0.77f, 0.14f, 0.16f);
+	StelVertexBuffer<VertexP2>* vertices = 
+		renderer->createVertexBuffer<VertexP2>(PrimitiveType_Lines);
+	const VertexP2 center(centerScreen[0], centerScreen[1]);
+	vertices->addVertex(center);
+	vertices->addVertex(VertexP2(centerScreen[0], centerScreen[1] + length));
+	vertices->addVertex(center);
+	vertices->addVertex(VertexP2(centerScreen[0], centerScreen[1] - length));
+	vertices->addVertex(center);
+	vertices->addVertex(VertexP2(centerScreen[0] + length, centerScreen[1]));
+	vertices->addVertex(center);
+	vertices->addVertex(VertexP2(centerScreen[0] - length, centerScreen[1]));
+	vertices->lock();
+
+	renderer->drawVertexBuffer(vertices);
+	delete vertices;
 }
 
-void Oculars::paintTelrad()
+void Oculars::paintTelrad(StelRenderer* renderer)
 {
 	if (!flagShowOculars) {
 		const StelProjectorP projector = StelApp::getInstance().getCore()->getProjection(StelCore::FrameEquinoxEqu);
@@ -1367,50 +1382,61 @@
 		// StelCore *core = StelApp::getInstance().getCore();
 		// StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
 
-		// StelPainter drawing
-		StelPainter painter(projector);
-		painter.setColor(0.77, 0.14, 0.16, 1.0);
+		renderer->setGlobalColor(0.77f, 0.14f, 0.16f);
 		Vec2i centerScreen(projector->getViewportPosX()+projector->getViewportWidth()/2,
-						   projector->getViewportPosY()+projector->getViewportHeight()/2);
-		painter.drawCircle(centerScreen[0], centerScreen[1], 0.5 * projector->getPixelPerRadAtCenter() * (M_PI/180) * (0.5));
-		painter.drawCircle(centerScreen[0], centerScreen[1], 0.5 * projector->getPixelPerRadAtCenter() * (M_PI/180) * (2.0));
-		painter.drawCircle(centerScreen[0], centerScreen[1], 0.5 * projector->getPixelPerRadAtCenter() * (M_PI/180) * (4.0));
-
+		                   projector->getViewportPosY()+projector->getViewportHeight()/2);
+
+		// Generate and draw the circles.
+		StelVertexBuffer<VertexP2>* circle =
+			renderer->createVertexBuffer<VertexP2>(PrimitiveType_LineStrip);
+		const float baseRadius = 0.5f * projector->getPixelPerRadAtCenter() * (M_PI / 180.0f);
+		StelGeometryBuilder().buildCircle(circle, centerScreen[0], centerScreen[1], baseRadius * 0.5f);
+		renderer->drawVertexBuffer(circle);
+	
+		circle->unlock();
+		circle->clear();
+		StelGeometryBuilder().buildCircle(circle, centerScreen[0], centerScreen[1], baseRadius * 2.0f);
+		renderer->drawVertexBuffer(circle);
+
+		circle->unlock();
+		circle->clear();
+		StelGeometryBuilder().buildCircle(circle, centerScreen[0], centerScreen[1], baseRadius * 4.0f);
+		renderer->drawVertexBuffer(circle);
+
+		delete circle;
 	}
 }
 
-void Oculars::paintOcularMask()
+
+void Oculars::paintOcularMask(StelRenderer* renderer)
 {
 	StelCore *core = StelApp::getInstance().getCore();
 	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
 
-	glDisable(GL_BLEND);
-	glColor3f(0.f,0.f,0.f);
-	glPushMatrix();
-	glTranslated(params.viewportCenter[0], params.viewportCenter[1], 0.0);
-	GLUquadricObj *quadric = gluNewQuadric();
-
-	GLdouble inner = 0.5 * params.viewportFovDiameter;
-
+	renderer->setBlendMode(BlendMode_None);
+	renderer->setGlobalColor(0.0f, 0.0f, 0.0f);
+
+	float inner = 0.5f * params.viewportFovDiameter;
 	// See if we need to scale the mask
 	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->appearentFOV() > 0.0 && !oculars[selectedOcularIndex]->isBinoculars()) {
 		inner = oculars[selectedOcularIndex]->appearentFOV() * inner / maxEyepieceAngle;
 	}
+	const float outer = params.viewportXywh[2] + params.viewportXywh[3];
+	const Vec2f offset(params.viewportCenter[0], params.viewportCenter[1]);
 
-	GLdouble outer = params.viewportXywh[2] + params.viewportXywh[3];
-	// Draw the mask
-	gluDisk(quadric, inner, outer, 256, 1);
+	StelGeometryRing* disc = 
+		StelGeometryBuilder().buildRing2D(RingParams(inner, outer).resolution(128, 1), offset);
+	disc->draw(renderer);
 	// the gray circle
-	glColor3f(0.15f,0.15f,0.15f);
-	gluDisk(quadric, inner - 1.0, inner, 256, 1);
-	gluDeleteQuadric(quadric);
-	glPopMatrix();
+	renderer->setGlobalColor(0.15f, 0.15f, 0.15f);
+	disc->setInnerOuterRadius(inner - 1.0f, inner);
+	disc->draw(renderer);
+	delete disc;
 }
 
-void Oculars::paintText(const StelCore* core)
+void Oculars::paintText(const StelCore* core, StelRenderer* renderer)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameAltAz);
-	StelPainter painter(prj);	
 
 	// Get the current instruments
 	CCD *ccd = NULL;
@@ -1420,22 +1446,20 @@
 	Ocular *ocular = oculars[selectedOcularIndex];
 	Telescope *telescope = telescopes[selectedTelescopeIndex];
 
-	// set up the color and the GL state
-	painter.setColor(0.8, 0.48, 0.0, 1);
-	glDisable(GL_TEXTURE_2D);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
+	// set up drawing
+	renderer->setGlobalColor(0.8f, 0.48f, 0.0f);
+	renderer->setBlendMode(BlendMode_Alpha);
 
 	// Get the X & Y positions, and the line height
-	painter.setFont(font);
+	renderer->setFont(font);
 	QString widthString = "MMMMMMMMMMMMMMMMMMM";
-	float insetFromRHS = painter.getFontMetrics().width(widthString);
+	const float insetFromRHS = QFontMetrics(font).width(widthString);
 	StelProjector::StelProjectorParams projectorParams = core->getCurrentStelProjectorParams();
 	int xPosition = projectorParams.viewportXywh[2];
 	xPosition -= insetFromRHS;
 	int yPosition = projectorParams.viewportXywh[3];
 	yPosition -= 40;
-	const int lineHeight = painter.getFontMetrics().height();
+	const int lineHeight = QFontMetrics(font).height();
 	
 	
 	// The Ocular
@@ -1457,22 +1481,22 @@
 		if (name.length() > widthString.length()) {
 			xPosition -= (insetFromRHS / 2.0);
 		}
-		painter.drawText(xPosition, yPosition, ocularNumberLabel);
+		renderer->drawText(TextParams(xPosition, yPosition, ocularNumberLabel));
 		yPosition-=lineHeight;
 		
 		if (!ocular->isBinoculars()) {
 			QString eFocalLength = QVariant(ocular->effectiveFocalLength()).toString();
 			// TRANSLATORS: FL = Focal length
 			QString eFocalLengthLabel = QString(q_("Ocular FL: %1 mm")).arg(eFocalLength);
-			painter.drawText(xPosition, yPosition, eFocalLengthLabel);
+			renderer->drawText(TextParams(xPosition, yPosition, eFocalLengthLabel));
 			yPosition-=lineHeight;
 			
 			QString ocularFov = QString::number(ocular->appearentFOV());
 			ocularFov.append(QChar(0x00B0));//Degree sign
 			// TRANSLATORS: aFOV = apparent field of view
 			QString ocularFOVLabel = QString(q_("Ocular aFOV: %1"))
-						 .arg(ocularFov);
-			painter.drawText(xPosition, yPosition, ocularFOVLabel);
+			                         .arg(ocularFov);
+			renderer->drawText(TextParams(xPosition, yPosition, ocularFOVLabel));
 			yPosition-=lineHeight;
 			
 			// The telescope
@@ -1489,7 +1513,7 @@
 				                       .arg(selectedTelescopeIndex)
 				                       .arg(telescopeName);
 			}
-			painter.drawText(xPosition, yPosition, telescopeNumberLabel);
+			renderer->drawText(TextParams(xPosition, yPosition, telescopeNumberLabel));
 			yPosition-=lineHeight;
 			
 			// General info
@@ -1498,14 +1522,14 @@
 			magString.append(QChar(0x00D7));//Multiplication sign
 			QString magnificationLabel = QString(q_("Magnification: %1"))
 			                             .arg(magString);
-			painter.drawText(xPosition, yPosition, magnificationLabel);
+			renderer->drawText(TextParams(xPosition, yPosition, magnificationLabel));
 			yPosition-=lineHeight;
 			
 			double fov = ((int)(ocular->actualFOV(telescope) * 10000.00)) / 10000.0;
 			QString fovString = QString::number(fov);
 			fovString.append(QChar(0x00B0));//Degree sign
 			QString fovLabel = QString(q_("FOV: %1")).arg(fovString);
-			painter.drawText(xPosition, yPosition, fovLabel);
+			renderer->drawText(TextParams(xPosition, yPosition, fovLabel));
 		}
 	}
 
@@ -1527,9 +1551,9 @@
 			                 .arg(selectedCCDIndex)
 			                 .arg(name);
 		}
-		painter.drawText(xPosition, yPosition, ccdSensorLabel);
+		renderer->drawText(TextParams(xPosition, yPosition, ccdSensorLabel));
 		yPosition-=lineHeight;
-		painter.drawText(xPosition, yPosition, ccdInfoLabel);
+		renderer->drawText(TextParams(xPosition, yPosition, ccdInfoLabel));
 		yPosition-=lineHeight;
 
 		// The telescope
@@ -1546,7 +1570,7 @@
 			                       .arg(selectedTelescopeIndex)
 			                       .arg(telescopeName);
 		}
-		painter.drawText(xPosition, yPosition, telescopeNumberLabel);
+		renderer->drawText(TextParams(xPosition, yPosition, telescopeNumberLabel));
 	}
 	
 }

=== modified file 'plugins/Oculars/src/Oculars.hpp'
--- plugins/Oculars/src/Oculars.hpp	2012-07-06 17:00:39 +0000
+++ plugins/Oculars/src/Oculars.hpp	2012-08-30 16:29:19 +0000
@@ -62,7 +62,7 @@
 	virtual void init();
 	virtual void deinit();
 	virtual bool configureGui(bool show=true);
-	virtual void draw(StelCore* core);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 	//! Returns the module-specific style sheet.
 	//! The main StelStyle instance should be passed.
@@ -134,18 +134,18 @@
 	bool isBinocularDefined();
 
 	//! Reneders the CCD bounding box on-screen.  A telescope must be selected, or this call does nothing.
-	void paintCCDBounds();
+	void paintCCDBounds(class StelRenderer* renderer);
 	//! Renders crosshairs into the viewport.
-	void paintCrosshairs();
+	void paintCrosshairs(class StelRenderer* renderer);
 	//! Paint the mask into the viewport.
-	void paintOcularMask();
+	void paintOcularMask(class StelRenderer* renderer);
 	//! Renders the three Telrad circles, but only if not in ocular mode.
-	void paintTelrad();
+	void paintTelrad(class StelRenderer* renderer);
 
 
 	//! Paints the text about the current object selections to the upper right hand of the screen.
 	//! Should only be called from a 'ready' state; currently from the draw() method.
-	void paintText(const StelCore* core);
+	void paintText(const StelCore* core, StelRenderer* renderer);
 
 	//! This method is called by the zoom() method, when this plugin is toggled off; it resets to the default view.
 	void unzoomOcular();

=== modified file 'plugins/Pulsars/src/Pulsar.cpp'
--- plugins/Pulsars/src/Pulsar.cpp	2012-08-08 10:11:01 +0000
+++ plugins/Pulsars/src/Pulsar.cpp	2012-08-30 16:29:19 +0000
@@ -19,27 +19,23 @@
 #include "Pulsar.hpp"
 #include "Pulsars.hpp"
 #include "StelObject.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
-#include "StelTexture.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelSkyDrawer.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QTextStream>
 #include <QDebug>
 #include <QVariant>
-#include <QtOpenGL>
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
 
 #define PSR_INERTIA 1.0e45 /* Typical moment of inertia for a pulsar */
 
-StelTextureSP Pulsar::markerTexture;
-
 Pulsar::Pulsar(const QVariantMap& map)
 		: initialized(false)
 {
@@ -334,7 +330,8 @@
 	labelsFader.update((int)(deltaTime*1000));
 }
 
-void Pulsar::draw(StelCore* core, StelPainter& painter)
+void Pulsar::draw(StelCore* core, StelRenderer* renderer, StelProjectorP projector,
+                  StelTextureNew* markerTexture)
 {
 	StelSkyDrawer* sd = core->getSkyDrawer();	
 
@@ -345,27 +342,26 @@
 	double mag = getVMagnitude(core, true);
 
 	StelUtils::spheToRect(RA, DE, XYZ);			
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_ONE, GL_ONE);
-	painter.setColor(color[0], color[1], color[2], 1);
+	renderer->setBlendMode(BlendMode_Add);
+	renderer->setGlobalColor(color[0], color[1], color[2]);
 
 	if (mag <= sd->getLimitMagnitude())
 	{
-
-		Pulsar::markerTexture->bind();
-		float size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
-		float shift = 5.f + size/1.6f;
+		markerTexture->bind();
+		const float size = getAngularSize(NULL)*M_PI/180.*projector->getPixelPerRadAtCenter();
+		const float shift = 5.f + size/1.6f;
 		if (labelsFader.getInterstate()<=0.f)
 		{
+			Vec3d win;
+			if(!projector->project(XYZ, win)){return;}
 			if (GETSTELMODULE(Pulsars)->getDisplayMode())
 			{
-				painter.drawSprite2dMode(XYZ, 4);
-				painter.drawText(XYZ, " ", 0, shift, shift, false);
+				renderer->drawTexturedRect(win[0] - 4, win[1] - 4, 8, 8);
 			}
 			else
 			{
-				painter.drawSprite2dMode(XYZ, 5);
-				painter.drawText(XYZ, designation, 0, shift, shift, false);
+				renderer->drawTexturedRect(win[0] - 5, win[1] - 5, 10, 10);
+				renderer->drawText(TextParams(XYZ, projector, designation).shift(shift, shift).useGravity());
 			}
 		}
 	}

=== modified file 'plugins/Pulsars/src/Pulsar.hpp'
--- plugins/Pulsars/src/Pulsar.hpp	2012-05-20 11:10:52 +0000
+++ plugins/Pulsars/src/Pulsar.hpp	2012-08-30 16:29:19 +0000
@@ -27,11 +27,10 @@
 #include <QDateTime>
 
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
+#include "StelProjectorType.hpp"
+
 #include "StelFader.hpp"
 
-class StelPainter;
 
 //! @class Pulsar
 //! A Pulsar object represents one pulsar on the sky.
@@ -88,10 +87,8 @@
 
 	Vec3d XYZ;                         // holds J2000 position	
 
-	static StelTextureSP hintTexture;
-	static StelTextureSP markerTexture;
-
-	void draw(StelCore* core, StelPainter& painter);
+	void draw(StelCore* core, StelRenderer* renderer, StelProjectorP projector,
+	          class StelTextureNew* markerTexture);
 
 	//! Variables for description of properties of pulsars
 	QString designation;	//! The designation of the pulsar (J2000 pulsar name)

=== modified file 'plugins/Pulsars/src/Pulsars.cpp'
--- plugins/Pulsars/src/Pulsars.cpp	2012-06-17 08:17:55 +0000
+++ plugins/Pulsars/src/Pulsars.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelGui.hpp"
@@ -25,7 +24,6 @@
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelObjectMgr.hpp"
-#include "StelTextureMgr.hpp"
 #include "StelJsonParser.hpp"
 #include "StelFileMgr.hpp"
 #include "StelUtils.hpp"
@@ -34,6 +32,7 @@
 #include "Pulsar.hpp"
 #include "Pulsars.hpp"
 #include "PulsarsDialog.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
@@ -47,6 +46,7 @@
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
+#include <QSettings>
 #include <QSharedPointer>
 #include <QStringList>
 
@@ -81,7 +81,9 @@
  Constructor
 */
 Pulsars::Pulsars()
-	: progressBar(NULL)
+	: texPointer(NULL)
+	, markerTexture(NULL)
+	, progressBar(NULL)
 {
 	setObjectName("Pulsars");
 	configDialog = new PulsarsDialog();
@@ -100,8 +102,14 @@
 void Pulsars::deinit()
 {
 	psr.clear();
-	Pulsar::markerTexture.clear();
-	texPointer.clear();
+	if(NULL != markerTexture)
+	{
+		delete markerTexture;
+	}
+	if(NULL != texPointer)
+	{
+		delete texPointer;
+	}
 }
 
 /*
@@ -136,9 +144,6 @@
 
 		jsonCatalogPath = StelFileMgr::findFile("modules/Pulsars", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/pulsars.json";
 
-		texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur2.png");
-		Pulsar::markerTexture = StelApp::getInstance().getTextureManager().createTexture(":/Pulsars/pulsar.png");
-
 		// key bindings and other actions
 		// TRANSLATORS: Title of a group of key bindings in the Help window
 		QString groupName = N_("Plugin Key Bindings");
@@ -195,27 +200,31 @@
 /*
  Draw our module. This should print name of first PSR in the main window
 */
-void Pulsars::draw(StelCore* core)
+void Pulsars::draw(StelCore* core, StelRenderer* renderer)
 {
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-	StelPainter painter(prj);
-	painter.setFont(font);
+	renderer->setFont(font);
 	
 	foreach (const PulsarP& pulsar, psr)
 	{
 		if (pulsar && pulsar->initialized)
-			pulsar->draw(core, painter);
+		{
+			if(NULL == markerTexture)
+			{
+				markerTexture = renderer->createTexture(":/Pulsars/pulsar.png");
+			}
+			pulsar->draw(core, renderer, prj, markerTexture);
+		}
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
-		drawPointer(core, painter);
-
+	{
+		drawPointer(core, renderer, prj);
+	}
 }
 
-void Pulsars::drawPointer(StelCore* core, StelPainter& painter)
+void Pulsars::drawPointer(StelCore* core, StelRenderer* renderer, StelProjectorP projector)
 {
-	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-
 	const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)->getSelectedObject("Pulsar");
 	if (!newSelected.empty())
 	{
@@ -224,16 +233,21 @@
 
 		Vec3d screenpos;
 		// Compute 2D pos and return if outside screen
-		if (!painter.getProjector()->project(pos, screenpos))
-			return;
+		if (!projector->project(pos, screenpos))
+		{
+			 return;
+		}
 
 		const Vec3f& c(obj->getInfoColor());
-		painter.setColor(c[0],c[1],c[2]);
+		renderer->setGlobalColor(c[0], c[1], c[2]);
+		if(NULL == texPointer)
+		{
+			texPointer = renderer->createTexture("textures/pointeur2.png");
+		}
 		texPointer->bind();
-		painter.enableTexture2d(true);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
-		painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, StelApp::getInstance().getTotalRunTime()*40.);
+		renderer->setBlendMode(BlendMode_Alpha);
+		renderer->drawTexturedRect(screenpos[0] - 13.0f, screenpos[1] - 13.0f, 26.0f, 26.0f,
+		                           StelApp::getInstance().getTotalRunTime() * 40.0f);
 	}
 }
 

=== modified file 'plugins/Pulsars/src/Pulsars.hpp'
--- plugins/Pulsars/src/Pulsars.hpp	2012-06-17 08:17:55 +0000
+++ plugins/Pulsars/src/Pulsars.hpp	2012-08-30 16:29:19 +0000
@@ -22,8 +22,6 @@
 #include "StelObjectModule.hpp"
 #include "StelObject.hpp"
 #include "StelFader.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "Pulsar.hpp"
 #include <QFont>
 #include <QVariantMap>
@@ -38,7 +36,6 @@
 class QTimer;
 class PulsarsDialog;
 
-class StelPainter;
 
 typedef QSharedPointer<Pulsar> PulsarP;
 
@@ -65,8 +62,8 @@
 	virtual void init();
 	virtual void deinit();
 	virtual void update(double) {;}
-	virtual void draw(StelCore* core);
-	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
+	virtual void drawPointer(StelCore* core, class StelRenderer* renderer, StelProjectorP projector);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 	///////////////////////////////////////////////////////////////////////////
@@ -180,7 +177,8 @@
 
 	QString jsonCatalogPath;
 
-	StelTextureSP texPointer;
+	class StelTextureNew* texPointer;
+	class StelTextureNew* markerTexture;
 	QList<PulsarP> psr;
 
 	// variables and functions for the updater

=== modified file 'plugins/Quasars/src/Quasar.cpp'
--- plugins/Quasars/src/Quasar.cpp	2012-08-08 10:11:01 +0000
+++ plugins/Quasars/src/Quasar.cpp	2012-08-30 16:29:19 +0000
@@ -19,24 +19,21 @@
 #include "Quasar.hpp"
 #include "Quasars.hpp"
 #include "StelObject.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
-#include "StelTexture.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelSkyDrawer.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QTextStream>
 #include <QDebug>
 #include <QVariant>
-#include <QtOpenGL>
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
 
-StelTextureSP Quasar::markerTexture;
 
 Quasar::Quasar(const QVariantMap& map)
 		: initialized(false)
@@ -170,11 +167,11 @@
 	labelsFader.update((int)(deltaTime*1000));
 }
 
-void Quasar::draw(StelCore* core, StelPainter& painter)
+void Quasar::draw(StelCore* core, StelRenderer* renderer, StelProjectorP projector, StelTextureNew* markerTexture)
 {
 	StelSkyDrawer* sd = core->getSkyDrawer();
 
-	Vec3f color = sd->indexToColor(BvToColorIndex(bV))*0.75f;
+	const Vec3f color = sd->indexToColor(BvToColorIndex(bV))*0.75f;
 	Vec3f dcolor = Vec3f(1.2f,0.5f,0.4f);
 	if (StelApp::getInstance().getVisionModeNight())
 		dcolor = StelUtils::getNightColor(dcolor);
@@ -183,42 +180,42 @@
 	double mag;
 
 	StelUtils::spheToRect(qRA, qDE, XYZ);
-        mag = getVMagnitude(core, true);	
+	mag = getVMagnitude(core, true);	
 
 	if (GETSTELMODULE(Quasars)->getDisplayMode())
 	{
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_ONE, GL_ONE);
-		painter.setColor(dcolor[0], dcolor[1], dcolor[2], 1);
-
-		Quasar::markerTexture->bind();
-		size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
+		renderer->setBlendMode(BlendMode_Add);
+		renderer->setGlobalColor(dcolor[0], dcolor[1], dcolor[2], 1);
+		size = getAngularSize(NULL)*M_PI/180.*projector->getPixelPerRadAtCenter();
 		shift = 5.f + size/1.6f;
+		markerTexture->bind();
 		if (labelsFader.getInterstate()<=0.f)
 		{
-			painter.drawSprite2dMode(XYZ, 4);
-			painter.drawText(XYZ, " ", 0, shift, shift, false);
+			Vec3d win;
+			if(projector->project(XYZ, win))
+			{
+				renderer->drawTexturedRect(win[0] - 4, win[1] - 4, 8, 8);
+			}
 		}
 	}
 	else
 	{
-		sd->preDrawPointSource(&painter);
+		sd->preDrawPointSource();
 	
 		if (mag <= sd->getLimitMagnitude())
 		{
 			sd->computeRCMag(mag, rcMag);
-			//sd->drawPointSource(&painter, Vec3f(XYZ[0], XYZ[1], XYZ[2]), rcMag, sd->indexToColor(BvToColorIndex(bV)), false);
-			sd->drawPointSource(&painter, XYZ, rcMag, sd->indexToColor(BvToColorIndex(bV)), false);
-			painter.setColor(color[0], color[1], color[2], 1);
-			size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
+			sd->drawPointSource(projector, XYZ, rcMag, sd->indexToColor(BvToColorIndex(bV)), false);
+			renderer->setGlobalColor(color[0], color[1], color[2], 1.0f);
+			size = getAngularSize(NULL)*M_PI/180.*projector->getPixelPerRadAtCenter();
 			shift = 6.f + size/1.8f;
 			if (labelsFader.getInterstate()<=0.f)
 			{
-				painter.drawText(XYZ, designation, 0, shift, shift, false);
+				renderer->drawText(TextParams(XYZ, projector, designation).shift(shift, shift).useGravity());
 			}
 		}
 
-		sd->postDrawPointSource(&painter);
+		sd->postDrawPointSource(projector);
 	}
 }
 

=== modified file 'plugins/Quasars/src/Quasar.hpp'
--- plugins/Quasars/src/Quasar.hpp	2012-06-17 08:33:36 +0000
+++ plugins/Quasars/src/Quasar.hpp	2012-08-30 16:29:19 +0000
@@ -27,11 +27,9 @@
 #include <QDateTime>
 
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "StelFader.hpp"
+#include "StelProjectorType.hpp"
 
-class StelPainter;
 
 //! @class Quasar
 //! A Quasar object represents one Quasar on the sky.
@@ -83,10 +81,9 @@
 
 	Vec3d XYZ;                         // holds J2000 position
 
-	static StelTextureSP hintTexture;
-	static StelTextureSP markerTexture;
+	void draw(StelCore* core, class StelRenderer* renderer, StelProjectorP projector, 
+	          class StelTextureNew* markerTexture);
 
-	void draw(StelCore* core, StelPainter& painter);
 	//! Calculate a color of quasar
 	//! @param b_v value of B-V color index
 	unsigned char BvToColorIndex(float b_v);

=== modified file 'plugins/Quasars/src/Quasars.cpp'
--- plugins/Quasars/src/Quasars.cpp	2012-06-17 08:33:36 +0000
+++ plugins/Quasars/src/Quasars.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelGui.hpp"
@@ -25,7 +24,6 @@
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelObjectMgr.hpp"
-#include "StelTextureMgr.hpp"
 #include "StelJsonParser.hpp"
 #include "StelFileMgr.hpp"
 #include "StelUtils.hpp"
@@ -33,6 +31,7 @@
 #include "LabelMgr.hpp"
 #include "Quasar.hpp"
 #include "Quasars.hpp"
+#include "renderer/StelRenderer.hpp"
 #include "QuasarsDialog.hpp"
 
 #include <QNetworkAccessManager>
@@ -41,14 +40,15 @@
 #include <QAction>
 #include <QProgressBar>
 #include <QDebug>
+#include <QFile>
 #include <QFileInfo>
-#include <QFile>
 #include <QTimer>
-#include <QVariantMap>
-#include <QVariant>
 #include <QList>
+#include <QSettings>
 #include <QSharedPointer>
 #include <QStringList>
+#include <QVariant>
+#include <QVariantMap>
 
 #define CATALOG_FORMAT_VERSION 1 /* Version of format of catalog */
 
@@ -81,7 +81,9 @@
  Constructor
 */
 Quasars::Quasars()
-	: progressBar(NULL)
+	: texPointer(NULL)
+	, markerTexture(NULL)
+	, progressBar(NULL)
 {
 	setObjectName("Quasars");
 	configDialog = new QuasarsDialog();
@@ -99,9 +101,10 @@
 
 void Quasars::deinit()
 {
+	if(NULL != texPointer)    {delete texPointer;}
+	if(NULL != markerTexture) {delete markerTexture;}
+	texPointer = markerTexture = NULL;
 	QSO.clear();
-	Quasar::markerTexture.clear();
-	texPointer.clear();
 }
 
 /*
@@ -136,9 +139,6 @@
 
 		catalogJsonPath = StelFileMgr::findFile("modules/Quasars", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/quasars.json";
 
-		texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur2.png");
-		Quasar::markerTexture = StelApp::getInstance().getTextureManager().createTexture(":/Quasars/quasar.png");
-
 		// key bindings and other actions
 		// TRANSLATORS: Title of a group of key bindings in the Help window
 		QString groupName = N_("Plugin Key Bindings");
@@ -195,45 +195,55 @@
 /*
  Draw our module. This should print name of first QSO in the main window
 */
-void Quasars::draw(StelCore* core)
+void Quasars::draw(StelCore* core, class StelRenderer* renderer)
 {
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-	StelPainter painter(prj);
-	painter.setFont(font);
+	renderer->setFont(font);
+
+	if(NULL == markerTexture)
+	{
+		markerTexture = renderer->createTexture(":/Quasars/quasar.png");
+	}
 	
 	foreach (const QuasarP& quasar, QSO)
 	{
 		if (quasar && quasar->initialized)
-			quasar->draw(core, painter);
+		{
+			quasar->draw(core, renderer, prj, markerTexture);
+		}
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
-		drawPointer(core, painter);
-
+	{
+		drawPointer(core, renderer, prj);
+	}
 }
 
-void Quasars::drawPointer(StelCore* core, StelPainter& painter)
+void Quasars::drawPointer(StelCore* core, StelRenderer* renderer, StelProjectorP projector)
 {
-	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-
 	const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)->getSelectedObject("Quasar");
 	if (!newSelected.empty())
 	{
 		const StelObjectP obj = newSelected[0];
 		Vec3d pos=obj->getJ2000EquatorialPos(core);
 
-		Vec3d screenpos;
+		Vec3d screenPos;
 		// Compute 2D pos and return if outside screen
-		if (!painter.getProjector()->project(pos, screenpos))
+		if (!projector->project(pos, screenPos))
+		{
 			return;
+		}
+		if(NULL == texPointer)
+		{
+			texPointer = renderer->createTexture("textures/pointeur2.png");
+		}
 
 		const Vec3f& c(obj->getInfoColor());
-		painter.setColor(c[0],c[1],c[2]);
+		renderer->setGlobalColor(c[0], c[1], c[2]);
 		texPointer->bind();
-		painter.enableTexture2d(true);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
-		painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, StelApp::getInstance().getTotalRunTime()*40.);
+		renderer->setBlendMode(BlendMode_Alpha);
+		renderer->drawTexturedRect(screenPos[0] - 13.0f, screenPos[1] - 13.0f, 26.0f, 26.0f, 
+		                           StelApp::getInstance().getTotalRunTime() * 40.0f);
 	}
 }
 

=== modified file 'plugins/Quasars/src/Quasars.hpp'
--- plugins/Quasars/src/Quasars.hpp	2012-06-17 08:33:36 +0000
+++ plugins/Quasars/src/Quasars.hpp	2012-08-30 16:29:19 +0000
@@ -21,8 +21,6 @@
 
 #include "StelObjectModule.hpp"
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "Quasar.hpp"
 #include <QFont>
 #include <QVariantMap>
@@ -30,7 +28,6 @@
 #include <QList>
 #include <QSharedPointer>
 
-class StelPainter;
 
 class QNetworkAccessManager;
 class QNetworkReply;
@@ -64,8 +61,8 @@
 	virtual void init();
 	virtual void deinit();
 	virtual void update(double) {;}
-	virtual void draw(StelCore* core);
-	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
+	virtual void drawPointer(StelCore* core, class StelRenderer* renderer, StelProjectorP projector);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 	///////////////////////////////////////////////////////////////////////////
@@ -179,7 +176,8 @@
 
 	QString catalogJsonPath;
 
-	StelTextureSP texPointer;
+	class StelTextureNew* texPointer;
+	class StelTextureNew* markerTexture;
 	QList<QuasarP> QSO;
 
 	// variables and functions for the updater

=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2012-08-25 10:58:23 +0000
+++ plugins/Satellites/src/Satellite.cpp	2012-08-30 16:29:19 +0000
@@ -19,20 +19,21 @@
 
 #include "Satellite.hpp"
 #include "StelObject.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelLocation.hpp"
 #include "StelCore.hpp"
-#include "StelTexture.hpp"
 #include "VecMath.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
+#include "renderer/StelCircleArcRenderer.hpp"
+#include "renderer/StelRenderer.hpp"
+#include "renderer/StelTextureNew.hpp"
+
 
 #include <QTextStream>
 #include <QRegExp>
 #include <QDebug>
 #include <QVariant>
-#include <QtOpenGL>
 #include <QSettings>
 #include <QByteArray>
 
@@ -41,7 +42,6 @@
 #include <cmath>
 
 // static data members - will be initialised in the Satallites class (the StelObjectMgr)
-StelTextureSP Satellite::hintTexture;
 float Satellite::showLabels = true;
 float Satellite::hintBrightness = 0.0;
 float Satellite::hintScale = 1.f;
@@ -476,47 +476,45 @@
 		return year + 1900;
 }
 
-void Satellite::draw(const StelCore* core, StelPainter& painter, float)
+void Satellite::draw(const StelCore* core, StelRenderer* renderer, 
+                     StelProjectorP projector, StelTextureNew* hintTexture)
 {
 	if (core->getJDay() < jdLaunchYearJan1) return;
 
 	XYZ = getJ2000EquatorialPos(core);
 	Vec3f drawColor;
 	(visibility==RADAR_NIGHT) ? drawColor = Vec3f(0.2f,0.2f,0.2f) : drawColor = hintColor;
-	StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0,1.0) : glColor4f(drawColor[0],drawColor[1],drawColor[2], Satellite::hintBrightness);
-
-	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
+	StelApp::getInstance().getVisionModeNight() 
+		? renderer->setGlobalColor(0.6,0.0,0.0,1.0) 
+		: renderer->setGlobalColor(drawColor[0],drawColor[1],drawColor[2], Satellite::hintBrightness);
 
 	Vec3d xy;
-	if (prj->project(XYZ,xy))
+	if (core->getProjection(StelCore::FrameJ2000)->project(XYZ,xy))
 	{
 		if (Satellite::showLabels)
 		{
-			painter.drawText(xy[0], xy[1], name, 0, 10, 10, false);
-			Satellite::hintTexture->bind();
+			renderer->drawText(TextParams(xy[0], xy[1], name).shift(10, 10).useGravity());
 		}
-		painter.drawSprite2dMode(xy[0], xy[1], 11);
+		renderer->drawTexturedRect(xy[0] - 11, xy[1] - 11, 22, 22);
 
-		if (orbitVisible && Satellite::orbitLinesFlag) drawOrbit(painter);
+		if (orbitVisible && Satellite::orbitLinesFlag) {drawOrbit(renderer, projector);}
 	}
 }
 
 
-void Satellite::drawOrbit(StelPainter& painter)
+void Satellite::drawOrbit(StelRenderer* renderer, StelProjectorP projector)
 {
 	Vec3d position,previousPosition;
 
-	glDisable(GL_TEXTURE_2D);
-
 	QList<Vec3d>::iterator it= orbitPoints.begin();
 
 	//First point projection calculation
 	previousPosition.set(it->operator [](0), it->operator [](1), it->operator [](2));
 
 	it++;
-	StelVertexArray vertexArray;
-	vertexArray.primitiveType=StelVertexArray::Lines;
 
+	QVector<Vec3d> orbitArcPoints;
+	StelCircleArcRenderer circleArcRenderer(renderer, projector);
 	//Rest of points
 	for (int i=1; i<orbitPoints.size(); i++)
 	{
@@ -528,21 +526,21 @@
 		// Draw end (fading) parts of orbit lines one segment at a time.
 		if (i<=orbitLineFadeSegments || orbitLineSegments-i < orbitLineFadeSegments)
 		{
-			painter.setColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2], hintBrightness * calculateOrbitSegmentIntensity(i));
-			painter.drawGreatCircleArc(previousPosition, position, &viewportHalfspace);
+			renderer->setGlobalColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2],
+			                         hintBrightness * calculateOrbitSegmentIntensity(i));
+			circleArcRenderer.drawGreatCircleArc(previousPosition, position, &viewportHalfspace);
 		}
 		else
 		{
-			vertexArray.vertex << previousPosition << position;
+			orbitArcPoints << previousPosition << position;
 		}
 		previousPosition = position;
 	}
 
 	// Draw center section of orbit in one go
-	painter.setColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2], hintBrightness);
-	painter.drawGreatCircleArcs(vertexArray, &viewportHalfspace);
-
-	glEnable(GL_TEXTURE_2D);
+	renderer->setGlobalColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2],
+	                         hintBrightness);
+	circleArcRenderer.drawGreatCircleArcs(orbitArcPoints, PrimitiveType_Lines, &viewportHalfspace);
 }
 
 

=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2012-08-25 10:58:23 +0000
+++ plugins/Satellites/src/Satellite.hpp	2012-08-30 16:29:19 +0000
@@ -28,14 +28,12 @@
 #include <QDateTime>
 
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
 #include "StelSphereGeometry.hpp"
+#include "StelProjectorType.hpp"
 
-#include "StelPainter.hpp"
 #include "gSatWrapper.hpp"
 
 
-class StelPainter;
 class StelLocation;
 
 typedef struct
@@ -120,7 +118,7 @@
 private:
 	//draw orbits methods
 	void computeOrbitPoints();
-	void drawOrbit(StelPainter& painter);
+	void drawOrbit(class StelRenderer* renderer, StelProjectorP projector);
 	//! returns 0 - 1.0 for the DRAWORBIT_FADE_NUMBER segments at
 	//! each end of an orbit, with 1 in the middle.
 	float calculateOrbitSegmentIntensity(int segNum);
@@ -155,7 +153,6 @@
 	QStringList groupIDs;
 	QDateTime lastUpdated;
 
-	static StelTextureSP hintTexture;
 	static SphericalCap  viewportHalfspace;
 	static float hintBrightness;
 	static float hintScale;
@@ -164,15 +161,16 @@
 	static int   orbitLineSegmentDuration; //measured in seconds
 	static bool  orbitLinesFlag;
 
-	void draw(const StelCore* core, StelPainter& painter, float maxMagHints);
+	void draw(const StelCore* core, class StelRenderer* renderer, 
+	          StelProjectorP projector, class StelTextureNew* hintTexture);
 
-        //Satellite Orbit Position calculation
-        gSatWrapper *pSatWrapper;
-        Vec3d position;
-        Vec3d velocity;
-        Vec3d latLongSubPointPosition;
-        Vec3d elAzPosition;
-        int   visibility;
+	//Satellite Orbit Position calculation
+	gSatWrapper *pSatWrapper;
+	Vec3d position;
+	Vec3d velocity;
+	Vec3d latLongSubPointPosition;
+	Vec3d elAzPosition;
+	int   visibility;
 
 	//Satellite Orbit Draw
 	QFont     font;

=== modified file 'plugins/Satellites/src/Satellites.cpp'
--- plugins/Satellites/src/Satellites.cpp	2012-08-25 09:46:49 +0000
+++ plugins/Satellites/src/Satellites.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelGui.hpp"
@@ -27,7 +26,6 @@
 #include "StelModuleMgr.hpp"
 #include "StelLocaleMgr.hpp"
 #include "StelFileMgr.hpp"
-#include "StelTextureMgr.hpp"
 #include "StelIniParser.hpp"
 #include "Satellites.hpp"
 #include "Satellite.hpp"
@@ -37,6 +35,7 @@
 #include "SatellitesDialog.hpp"
 #include "LabelMgr.hpp"
 #include "StelTranslator.hpp"
+#include "renderer/StelRenderer.hpp"
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
@@ -72,9 +71,16 @@
 Q_EXPORT_PLUGIN2(Satellites, SatellitesStelPluginInterface)
 
 Satellites::Satellites()
-	: pxmapGlow(NULL), pxmapOnIcon(NULL), pxmapOffIcon(NULL), toolbarButton(NULL),
-	  earth(NULL), defaultHintColor(0.0, 0.4, 0.6), defaultOrbitColor(0.0, 0.3, 0.6),
-	  progressBar(NULL)
+	: hintTexture(NULL)
+	, texPointer(NULL)
+	, pxmapGlow(NULL)
+	, pxmapOnIcon(NULL)
+	, pxmapOffIcon(NULL)
+	, toolbarButton(NULL)
+	, earth(NULL)
+	, defaultHintColor(0.0, 0.4, 0.6)
+	, defaultOrbitColor(0.0, 0.3, 0.6)
+	, progressBar(NULL)
 {
 	setObjectName("Satellites");
 	configDialog = new SatellitesDialog();
@@ -82,8 +88,14 @@
 
 void Satellites::deinit()
 {
-	Satellite::hintTexture.clear();
-	texPointer.clear();
+	if(NULL != hintTexture)
+	{
+		delete hintTexture;
+	}
+	if(NULL != texPointer)
+	{
+		delete texPointer;
+	}
 }
 
 Satellites::~Satellites()
@@ -120,8 +132,6 @@
 		satellitesJsonPath = StelFileMgr::findFile("modules/Satellites", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/satellites.json";
 
 		// Load and find resources used in the plugin
-		texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur5.png");
-		Satellite::hintTexture = StelApp::getInstance().getTextureManager().createTexture(":/satellites/hint.png");
 
 		// key bindings and other actions
 		// TRANSLATORS: Title of a group of key bindings in the Help window
@@ -1160,7 +1170,7 @@
 	}
 }
 
-void Satellites::draw(StelCore* core)
+void Satellites::draw(StelCore* core, StelRenderer* renderer)
 {
 	if (core->getCurrentLocation().planetName != earth->getEnglishName() ||
 			(core->getJDay()<2436116.3115)                               || // do not draw anything before Oct 4, 1957, 19:28:34GMT ;-)
@@ -1168,26 +1178,32 @@
 		return;
 
 	StelProjectorP prj = core->getProjection(StelCore::FrameAltAz);
-	StelPainter painter(prj);
-	painter.setFont(labelFont);
+	renderer->setFont(labelFont);
 	Satellite::hintBrightness = hintFader.getInterstate();
 
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
-	glEnable(GL_TEXTURE_2D);
-	Satellite::hintTexture->bind();
-	Satellite::viewportHalfspace = painter.getProjector()->getBoundingCap();
+	renderer->setBlendMode(BlendMode_Alpha);
+
+	if(NULL == hintTexture)
+	{
+		hintTexture = renderer->createTexture(":/satellites/hint.png");
+	}
+	hintTexture->bind();
+	Satellite::viewportHalfspace = prj->getBoundingCap();
 	foreach (const SatelliteP& sat, satellites)
 	{
 		if (sat && sat->initialized && sat->visible)
-			sat->draw(core, painter, 1.0);
+		{
+			sat->draw(core, renderer, prj, hintTexture);
+		}
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
-		drawPointer(core, painter);
+	{
+		drawPointer(core, renderer);
+	}
 }
 
-void Satellites::drawPointer(StelCore* core, StelPainter& painter)
+void Satellites::drawPointer(StelCore* core, StelRenderer* renderer)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 
@@ -1200,25 +1216,33 @@
 
 		// Compute 2D pos and return if outside screen
 		if (!prj->project(pos, screenpos))
+		{
 			return;
+		}
+		if(NULL == texPointer)
+		{
+			texPointer = renderer->createTexture("textures/pointeur5.png");
+		}
 		if (StelApp::getInstance().getVisionModeNight())
-			glColor3f(0.8f,0.0f,0.0f);
+			renderer->setGlobalColor(0.8f,0.0f,0.0f);
 		else
-			glColor3f(0.4f,0.5f,0.8f);
+			renderer->setGlobalColor(0.4f,0.5f,0.8f);
 		texPointer->bind();
 
-		glEnable(GL_TEXTURE_2D);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
+		renderer->setBlendMode(BlendMode_Alpha);
 
 		// Size on screen
 		float size = obj->getAngularSize(core)*M_PI/180.*prj->getPixelPerRadAtCenter();
 		size += 12.f + 3.f*std::sin(2.f * StelApp::getInstance().getTotalRunTime());
-		// size+=20.f + 10.f*std::sin(2.f * StelApp::getInstance().getTotalRunTime());
-		painter.drawSprite2dMode(screenpos[0]-size/2, screenpos[1]-size/2, 20, 90);
-		painter.drawSprite2dMode(screenpos[0]-size/2, screenpos[1]+size/2, 20, 0);
-		painter.drawSprite2dMode(screenpos[0]+size/2, screenpos[1]+size/2, 20, -90);
-		painter.drawSprite2dMode(screenpos[0]+size/2, screenpos[1]-size/2, 20, -180);
+		const float halfSize = size * 0.5;
+		const float left   = screenpos[0] - halfSize - 20;
+		const float right  = screenpos[0] + halfSize - 20;
+		const float top    = screenpos[1] - halfSize - 20;
+		const float bottom = screenpos[1] + halfSize - 20;
+		renderer->drawTexturedRect(left,  top,    40, 40, 90);
+		renderer->drawTexturedRect(left,  bottom, 40, 40, 0);
+		renderer->drawTexturedRect(right, bottom, 40, 40, -90);
+		renderer->drawTexturedRect(right, top,    40, 40, -180);
 	}
 }
 

=== modified file 'plugins/Satellites/src/Satellites.hpp'
--- plugins/Satellites/src/Satellites.hpp	2012-07-29 19:00:03 +0000
+++ plugins/Satellites/src/Satellites.hpp	2012-08-30 16:29:19 +0000
@@ -93,8 +93,8 @@
 	virtual void init();
 	virtual void deinit();
 	virtual void update(double deltaTime);
-	virtual void draw(StelCore* core);
-	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
+	virtual void drawPointer(StelCore* core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 	///////////////////////////////////////////////////////////////////////////
@@ -298,7 +298,8 @@
 	QString satellitesJsonPath;
 	QList<SatelliteP> satellites;
 	LinearFader hintFader;
-	StelTextureSP texPointer;
+	class StelTextureNew* hintTexture;
+	class StelTextureNew* texPointer;
 	QPixmap* pxmapGlow;
 	QPixmap* pxmapOnIcon;
 	QPixmap* pxmapOffIcon;

=== modified file 'plugins/SolarSystemEditor/src/SolarSystemEditor.cpp'
--- plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	2012-01-11 10:50:37 +0000
+++ plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	2012-08-30 16:29:19 +0000
@@ -127,7 +127,7 @@
 	//
 }
 
-void SolarSystemEditor::draw(StelCore*) //core
+void SolarSystemEditor::draw(StelCore*, class StelRenderer*) //core
 {
 	//
 }

=== modified file 'plugins/SolarSystemEditor/src/SolarSystemEditor.hpp'
--- plugins/SolarSystemEditor/src/SolarSystemEditor.hpp	2012-01-11 10:50:37 +0000
+++ plugins/SolarSystemEditor/src/SolarSystemEditor.hpp	2012-08-30 16:29:19 +0000
@@ -77,7 +77,7 @@
 	//! Dialog windows don't need explicit drawing, it's done automatically.
 	//! If a plug-in draws on the screen, it should be able to respect
 	//! the night vision mode.
-	virtual void draw(StelCore * core);
+	virtual void draw(StelCore * core, class StelRenderer* renderer);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 	//! called when the "configure" button in the "Plugins" tab is pressed
 	virtual bool configureGui(bool show);

=== modified file 'plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp'
--- plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp	2012-02-13 18:59:16 +0000
+++ plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp	2012-08-30 16:29:19 +0000
@@ -31,6 +31,7 @@
 #include "StelApp.hpp"
 #include "StelFileMgr.hpp"
 #include "StelModuleMgr.hpp"
+#include "StelUtils.hpp"
 //#include "StelTranslator.hpp"
 
 
@@ -235,13 +236,13 @@
 		return false;
 	}
 
-	if (!verifyPowerOfTwo(texture.height()))
+	if (!StelUtils::isPowerOfTwo(texture.height()))
 	{
 		qDebug() << "Invalid texure height:" << texture.height()
 				<< "for file" << filePath;
 		return false;
 	}
-	if (!verifyPowerOfTwo(texture.width()))
+	if (!StelUtils::isPowerOfTwo(texture.width()))
 	{
 		qDebug() << "Invalid texture width:" << texture.width()
 				<< "for file" << filePath;
@@ -250,11 +251,3 @@
 
 	return true;
 }
-
-bool ManualImportWindow::verifyPowerOfTwo(int value)
-{
-	if (value > 0 && (value & (value-1)) == 0)
-		return true;
-	else
-		return false;
-}

=== modified file 'plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp'
--- plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp	2012-02-13 18:59:16 +0000
+++ plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp	2012-08-30 16:29:19 +0000
@@ -68,10 +68,9 @@
 	void setColorButtonColor(QColor newColor);
 
 	void selectTextureFile(QLineEdit * filePathLineEdit);
-	//! Check if a file is a valid graphics file with OpenGL texture dimensions.
-	//! OpenGL accepts only dimentions that are powers of 2 (512, 1024, etc.)
+	//! Check if a file is a valid graphics file with power-of-two texture dimensions.
+	//! StelRenderer only guarantees support for dimentions that are powers of 2 (512, 1024, etc.)
 	bool verifyTextureFile(QString filePath);
-	bool verifyPowerOfTwo(int value);
 
 protected:
 	virtual void createDialogContent();

=== modified file 'plugins/Supernovae/src/Supernova.cpp'
--- plugins/Supernovae/src/Supernova.cpp	2012-08-08 10:11:01 +0000
+++ plugins/Supernovae/src/Supernova.cpp	2012-08-30 16:29:19 +0000
@@ -18,19 +18,17 @@
 
 #include "Supernova.hpp"
 #include "StelObject.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
-#include "StelTexture.hpp"
 #include "StelUtils.hpp"
 #include "StelTranslator.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelSkyDrawer.hpp"
+#include "StelRenderer.hpp"
 
 #include <QTextStream>
 #include <QDebug>
 #include <QVariant>
-#include <QtOpenGL>
 #include <QVariantMap>
 #include <QVariant>
 #include <QList>
@@ -202,7 +200,7 @@
 	labelsFader.update((int)(deltaTime*1000));
 }
 
-void Supernova::draw(StelCore* core, StelPainter& painter)
+void Supernova::draw(StelCore* core, StelRenderer* renderer, StelProjectorP projector)
 {
 	StelSkyDrawer* sd = core->getSkyDrawer();
 
@@ -215,21 +213,20 @@
 
 	StelUtils::spheToRect(snra, snde, XYZ);
 	mag = getVMagnitude(core, true);
-	sd->preDrawPointSource(&painter);
+	sd->preDrawPointSource();
 	
 	if (mag <= sd->getLimitMagnitude())
 	{
 		sd->computeRCMag(mag, rcMag);		
-//		sd->drawPointSource(&painter, Vec3f(XYZ[0], XYZ[1], XYZ[2]), rcMag, color, false);
-		sd->drawPointSource(&painter, XYZ, rcMag, color, false);
-		painter.setColor(color[0], color[1], color[2], 1);
-		size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
+		sd->drawPointSource(projector, XYZ, rcMag, color, false);
+		renderer->setGlobalColor(color[0], color[1], color[2], 1);
+		size = getAngularSize(NULL)*M_PI/180.*projector->getPixelPerRadAtCenter();
 		shift = 6.f + size/1.8f;
 		if (labelsFader.getInterstate()<=0.f)
 		{
-			painter.drawText(XYZ, designation, 0, shift, shift, false);
+			renderer->drawText(TextParams(XYZ, projector, designation).shift(shift, shift).useGravity());
 		}
 	}
 
-	sd->postDrawPointSource(&painter);
+	sd->postDrawPointSource(projector);
 }

=== modified file 'plugins/Supernovae/src/Supernova.hpp'
--- plugins/Supernovae/src/Supernova.hpp	2012-01-11 10:50:37 +0000
+++ plugins/Supernovae/src/Supernova.hpp	2012-08-30 16:29:19 +0000
@@ -27,11 +27,9 @@
 #include <QDateTime>
 
 #include "StelObject.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "StelFader.hpp"
+#include "StelProjectorType.hpp"
 
-class StelPainter;
 
 //! @class Supernova
 //! A Supernova object represents one supernova on the sky.
@@ -83,9 +81,7 @@
 
 	Vec3d XYZ;                         // holds J2000 position
 
-	static StelTextureSP hintTexture;
-
-	void draw(StelCore* core, StelPainter& painter);
+	void draw(StelCore* core, class StelRenderer* renderer, StelProjectorP projector);
 
 	// Supernova
 	QString designation;               //! The ID of the supernova

=== modified file 'plugins/Supernovae/src/Supernovae.cpp'
--- plugins/Supernovae/src/Supernovae.cpp	2012-07-29 09:54:59 +0000
+++ plugins/Supernovae/src/Supernovae.cpp	2012-08-30 16:29:19 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "StelProjector.hpp"
-#include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelGui.hpp"
@@ -25,7 +24,6 @@
 #include "StelLocaleMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelObjectMgr.hpp"
-#include "StelTextureMgr.hpp"
 #include "StelJsonParser.hpp"
 #include "StelFileMgr.hpp"
 #include "StelUtils.hpp"
@@ -33,6 +31,8 @@
 #include "LabelMgr.hpp"
 #include "Supernova.hpp"
 #include "Supernovae.hpp"
+#include "renderer/StelRenderer.hpp"
+#include "renderer/StelTextureNew.hpp"
 #include "SupernovaeDialog.hpp"
 
 #include <QNetworkAccessManager>
@@ -41,14 +41,15 @@
 #include <QAction>
 #include <QProgressBar>
 #include <QDebug>
+#include <QFile>
 #include <QFileInfo>
-#include <QFile>
 #include <QTimer>
-#include <QVariantMap>
-#include <QVariant>
 #include <QList>
+#include <QSettings>
 #include <QSharedPointer>
 #include <QStringList>
+#include <QVariant>
+#include <QVariantMap>
 
 #define CATALOG_FORMAT_VERSION 1 /* Version of format of catalog */
 
@@ -81,7 +82,8 @@
  Constructor
 */
 Supernovae::Supernovae()
-	: progressBar(NULL)
+	: texPointer(NULL)
+	, progressBar(NULL)
 {
 	setObjectName("Supernovae");
 	configDialog = new SupernovaeDialog();
@@ -99,7 +101,10 @@
 
 void Supernovae::deinit()
 {
-	texPointer.clear();
+	if(NULL != texPointer)
+	{
+		delete texPointer;
+	}
 }
 
 /*
@@ -133,9 +138,6 @@
 		readSettingsFromConfig();
 
 		sneJsonPath = StelFileMgr::findFile("modules/Supernovae", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/supernovae.json";
-
-		texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur2.png");
-
 		// key bindings and other actions
 		// TRANSLATORS: Title of a group of key bindings in the Help window
 		QString groupName = N_("Plugin Key Bindings");
@@ -192,27 +194,27 @@
 /*
  Draw our module. This should print name of first SNe in the main window
 */
-void Supernovae::draw(StelCore* core)
+void Supernovae::draw(StelCore* core, StelRenderer* renderer)
 {
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-	StelPainter painter(prj);
-	painter.setFont(font);
+	renderer->setFont(font);
 	
 	foreach (const SupernovaP& sn, snstar)
 	{
 		if (sn && sn->initialized)
-			sn->draw(core, painter);
+		{
+			sn->draw(core, renderer, prj);
+		}
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
-		drawPointer(core, painter);
-
+	{
+		drawPointer(core, renderer, prj);
+	}
 }
 
-void Supernovae::drawPointer(StelCore* core, StelPainter& painter)
+void Supernovae::drawPointer(StelCore* core, StelRenderer* renderer, StelProjectorP projector)
 {
-	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-
 	const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)->getSelectedObject("Supernova");
 	if (!newSelected.empty())
 	{
@@ -221,16 +223,21 @@
 
 		Vec3d screenpos;
 		// Compute 2D pos and return if outside screen
-		if (!painter.getProjector()->project(pos, screenpos))
+		if (!projector->project(pos, screenpos))
+		{
 			return;
+		}
 
 		const Vec3f& c(obj->getInfoColor());
-		painter.setColor(c[0],c[1],c[2]);
+		renderer->setGlobalColor(c[0],c[1],c[2]);
+		if(NULL == texPointer)
+		{
+			texPointer = renderer->createTexture("textures/pointeur2.png");
+		}
 		texPointer->bind();
-		painter.enableTexture2d(true);
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
-		painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, StelApp::getInstance().getTotalRunTime()*40.);
+		renderer->setBlendMode(BlendMode_Alpha);
+		renderer->drawTexturedRect(screenpos[0] - 13.0f, screenpos[1] - 13.0f, 26.0f, 26.0f,
+		                           StelApp::getInstance().getTotalRunTime() * 40.0f);
 	}
 }
 

=== modified file 'plugins/Supernovae/src/Supernovae.hpp'
--- plugins/Supernovae/src/Supernovae.hpp	2012-07-29 09:54:59 +0000
+++ plugins/Supernovae/src/Supernovae.hpp	2012-08-30 16:29:19 +0000
@@ -22,8 +22,6 @@
 #include "StelObjectModule.hpp"
 #include "StelObject.hpp"
 #include "StelFader.hpp"
-#include "StelTextureTypes.hpp"
-#include "StelPainter.hpp"
 #include "Supernova.hpp"
 #include <QFont>
 #include <QVariantMap>
@@ -39,8 +37,6 @@
 class QTimer;
 class SupernovaeDialog;
 
-class StelPainter;
-
 typedef QSharedPointer<Supernova> SupernovaP;
 
 //! This is an example of a plug-in which can be dynamically loaded into stellarium
@@ -66,8 +62,8 @@
 	virtual void init();
 	virtual void deinit();
 	virtual void update(double) {;}
-	virtual void draw(StelCore* core);
-	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void draw(StelCore* core, class StelRenderer* renderer);
+	virtual void drawPointer(StelCore* core, class StelRenderer* renderer, StelProjectorP projector);
 	virtual double getCallOrder(StelModuleActionName actionName) const;
 
 	///////////////////////////////////////////////////////////////////////////
@@ -181,7 +177,7 @@
 
 	QString sneJsonPath;
 
-	StelTextureSP texPointer;
+	class StelTextureNew* texPointer;
 	QList<SupernovaP> snstar;
 	QHash<QString, double> snlist;
 

=== modified file 'plugins/TelescopeControl/src/TelescopeControl.cpp'
--- plugins/TelescopeControl/src/TelescopeControl.cpp	2012-01-11 10:50:37 +0000
+++ plugins/TelescopeControl/src/TelescopeControl.cpp	2012-08-30 16:29:19 +0000
@@ -42,10 +42,11 @@
 #include "StelMovementMgr.hpp"
 #include "StelObject.hpp"
 #include "StelObjectMgr.hpp"
-#include "StelPainter.hpp"
 #include "StelProjector.hpp"
 #include "StelStyle.hpp"
-#include "StelTextureMgr.hpp"
+#include "renderer/StelGeometryBuilder.hpp"
+#include "renderer/StelRenderer.hpp"
+#include "renderer/StelTextureNew.hpp"
 
 #include <QAction>
 #include <QDateTime>
@@ -85,6 +86,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Constructor and destructor
 TelescopeControl::TelescopeControl()
+	: pixmapHover(NULL)
+	, pixmapOnIcon(NULL)
+	, pixmapOffIcon(NULL)
+	, reticleTexture(NULL)
+	, selectionTexture(NULL)
+	, telescopeDialog(NULL)
+	, slewDialog(NULL)
 {
 	setObjectName("TelescopeControl");
 
@@ -138,10 +146,6 @@
 		//Load and start all telescope clients
 		loadTelescopes();
 		
-		//Load OpenGL textures
-		reticleTexture = StelApp::getInstance().getTextureManager().createTexture(":/telescopeControl/telescope_reticle.png");
-		selectionTexture = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur2.png");
-		
 		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 		
 		//Create telescope key bindings
@@ -165,7 +169,7 @@
 			connect(gui->getGuiActions(name), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
 		}
 	
-		//Create and initialize dialog windows
+		//Create and initialize dialog windows 
 		telescopeDialog = new TelescopeDialog();
 		slewDialog = new SlewDialog();
 		
@@ -175,10 +179,10 @@
 		connect(slewDialog, SIGNAL(visibleChanged(bool)), gui->getGuiActions("actionShow_Slew_Window"), SLOT(setChecked(bool)));
 		
 		//Create toolbar button
-		pixmapHover =	new QPixmap(":/graphicGui/glow32x32.png");
-		pixmapOnIcon =	new QPixmap(":/telescopeControl/button_Slew_Dialog_on.png");
-		pixmapOffIcon =	new QPixmap(":/telescopeControl/button_Slew_Dialog_off.png");
-		toolbarButton =	new StelButton(NULL, *pixmapOnIcon, *pixmapOffIcon, *pixmapHover, gui->getGuiActions("actionShow_Slew_Window"));
+		pixmapHover   = new QPixmap(":/graphicGui/glow32x32.png");
+		pixmapOnIcon  = new QPixmap(":/telescopeControl/button_Slew_Dialog_on.png");
+		pixmapOffIcon = new QPixmap(":/telescopeControl/button_Slew_Dialog_off.png");
+		toolbarButton = new StelButton(NULL, *pixmapOnIcon, *pixmapOffIcon, *pixmapHover, gui->getGuiActions("actionShow_Slew_Window"));
 		gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
 	}
 	catch (std::runtime_error &e)
@@ -216,6 +220,18 @@
 		++iterator;
 	}
 
+	if(NULL != reticleTexture)   {delete reticleTexture;}
+	if(NULL != selectionTexture) {delete selectionTexture;}
+	if(NULL != telescopeDialog)  {delete telescopeDialog;}
+	if(NULL != slewDialog)       {delete slewDialog;}
+	if(NULL != pixmapHover)      {delete pixmapHover;}
+	if(NULL != pixmapOnIcon)     {delete pixmapOnIcon;}
+	if(NULL != pixmapOffIcon)    {delete pixmapOffIcon;}
+	reticleTexture = selectionTexture = NULL;
+	telescopeDialog = NULL;
+	slewDialog = NULL;
+	pixmapHover = pixmapOnIcon = pixmapOffIcon;
+
 	//TODO: Decide if it should be saved on change
 	//Save the configuration on exit
 	saveConfiguration();
@@ -230,15 +246,17 @@
 	communicate();
 }
 
-void TelescopeControl::draw(StelCore* core)
+void TelescopeControl::draw(StelCore* core, StelRenderer* renderer)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
-	StelPainter sPainter(prj);
-	sPainter.setFont(labelFont);
-	glEnable(GL_TEXTURE_2D);
-	glEnable(GL_BLEND);