--- a/src/gldraw.h Tue Jul 02 01:42:43 2013 +0300
+++ b/src/gldraw.h Tue Jul 02 21:39:47 2013 +0300
@@ -45,6 +45,9 @@
QImage* img;
};
+// Alias for short namespaces
+typedef GLRenderer GL;
+
// =============================================================================
// GLRenderer
//
@@ -81,6 +84,7 @@
overlayMeta& getOverlay (int newcam);
void hardRefresh ();
void initGLData ();
+ void overlaysFromObjects ();
void refresh ();
void resetAngles ();
uchar* screencap (ushort& w, ushort& h);
@@ -88,6 +92,7 @@
void setCamera (const Camera cam);
void setDepthValue (double depth);
void setupOverlay ();
+ void updateOverlayObjects();
void zoomNotch (bool inward);
void zoomToFit ();
@@ -146,7 +151,7 @@
void compileVertex (const vertex& vrt); // Compile a single vertex to a list
vertex coordconv2_3 (const QPoint& pos2d, bool snap) const; // Convert a 2D point to a 3D point
QPoint coordconv3_2 (const vertex& pos3d) const; // Convert a 3D point to a 2D point
- void buildKnownVertBlips ();
+ LDOverlay* findOverlayObject ( GL::Camera cam );
void updateRectVerts ();
void pick (uint mouseX, uint mouseY); // Perform object selection
void setObjectColor (LDObject* obj, const ListType list); // Set the color to an object list
@@ -155,9 +160,6 @@
void slot_toolTipTimer ();
};
-// Alias for short namespaces
-typedef GLRenderer GL;
-
static const GLRenderer::ListType g_glListTypes[] = {
GL::NormalList,
GL::PickList,