Use new star rendering code by default in the render paths where it is supported. The '@' key binding for edit mode is restored.

src/celengine/render.cpp

@@ -1023,6 +1023,9 @@ void renderOrbitColor(int classification, bool selected)
         case Body::Spacecraft:
             glColor4f(0.4f, 0.4f, 0.4f, 1.0f);
             break;
+        case Body::Stellar:
+            glColor4f(0.5f, 0.5f, 0.8f, 1.0f);
+            break;
         case Body::Planet:
         default:
             glColor4f(0.0f, 0.4f, 1.0f, 1.0f);
@@ -1136,7 +1139,7 @@ void Renderer::renderOrbit(const OrbitPathListEntry& orbitPath, double t)
         highlight = highlightObject.body() == body;
     else
         highlight = highlightObject.star() == orbitPath.star;
-    renderOrbitColor(body != NULL ? body->getClassification() : Body::Planet, highlight);
+    renderOrbitColor(body != NULL ? body->getClassification() : Body::Stellar, highlight);
 
     // Actually render the orbit
     if (orbit->isPeriodic())
@@ -1323,9 +1326,7 @@ void Renderer::render(const Observer& observer,
 
     locationFilter = observer.getLocationFilter();
 
-    if ((renderFlags & ShowNewStars) != 0 &&
-         usePointSprite &&
-         getGLContext()->getVertexProcessor() != NULL)
+    if (usePointSprite && getGLContext()->getVertexProcessor() != NULL)
     {
         useNewStarRendering = true;
     }

src/celengine/render.h

@@ -83,8 +83,8 @@ class Renderer
         SpacecraftLabels    = 0x040,
         LocationLabels      = 0x080,
         CometLabels         = 0x100,
-		NebulaLabels        = 0x200,
-		OpenClusterLabels   = 0x400,
+        NebulaLabels        = 0x200,
+        OpenClusterLabels   = 0x400,
         I18nConstellationLabels = 0x800,
         BodyLabelMask       = (PlanetLabels | MoonLabels | AsteroidLabels | SpacecraftLabels | CometLabels),
     };
@@ -109,9 +109,8 @@ class Renderer
         ShowCometTails      = 0x8000,
         ShowMarkers         = 0x10000,
         ShowPartialTrajectories = 0x20000,
-	    ShowNebulae         = 0x40000,
-		ShowOpenClusters    = 0x80000,
-		ShowNewStars        = 0x100000, // temporary, for debugging new star code
+        ShowNebulae         = 0x40000,
+        ShowOpenClusters    = 0x80000,
         ShowCloudShadows    = 0x200000,
     };
 

src/celestia/celestiacore.cpp

@@ -2045,10 +2045,9 @@ void CelestiaCore::charEntered(const char *c_p, int /*modifiers*/)
         break;
 
     case '@':
-        // Obsolete?
-        //editMode = !editMode;
-        renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowNewStars);
-        notifyWatchers(RenderFlagsChanged);
+        // TODO: 'Edit mode' should be eliminated; it can be done better
+        // with a Lua script.
+        editMode = !editMode;
         break;
     }
 }