change order so svga is used before text and so svga reports when it can't initialize rather than terminating the program

Author: programmerjake

Diff for: lib3d.cbp

@@ -11,7 +11,7 @@
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
-				<Option parameters="test_objects/f16/f16.ac" />
+				<Option parameters="/usr/share/games/flightgear/Aircraft/Dragonfly/Models/Dragonfly.ac" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="`sdl2-config --cflags` `pkg-config libavcodec libavformat libavutil libswscale MagickWand --cflags`" />

Diff for: model.cpp

@@ -702,11 +702,11 @@ class AC3DModelLoader : public ModelLoader // documentation is at http://www.ini
         }
         return RGBAF(limit<float>(color.r, 0, 1), limit<float>(color.g, 0, 1), limit<float>(color.b, 0, 1), limit<float>(color.a, 0, 1));
     }
-    ColorF parseColorSpecifier(size_t startingIndex, function<void(string)> warningFunction)
+    ColorF parseColorSpecifier(size_t startingIndex, function<void(string)> warningFunction, float scale = 1.0f)
     {
         if(line.size() < 3 + startingIndex)
             throw ModelLoadException("too few arguments for " + line[0]);
-        return validateColor(RGBF(parseFloat(line[startingIndex]), parseFloat(line[startingIndex + 1]), parseFloat(line[startingIndex + 2])), warningFunction);
+        return validateColor(RGBF(parseFloat(line[startingIndex]) * scale, parseFloat(line[startingIndex + 1]) * scale, parseFloat(line[startingIndex + 2]) * scale), warningFunction);
     }
     shared_ptr<Texture> loadImage(string fileName)
     {
@@ -912,9 +912,9 @@ class AC3DModelLoader : public ModelLoader // documentation is at http://www.ini
                         };
                         if((flags & typeMask) > 2)
                             throw ModelLoadException("invalid SURF flags : invalid type");
-                        bool isShaded = false;
+                        bool isShaded = true;
                         if(flags & shadedFlagMask)
-                            isShaded = true;
+                            isShaded = false;
                         bool isTwoSided = false;
                         if(flags & twoSidedFlagMask)
                             isTwoSided = true;
@@ -940,6 +940,10 @@ class AC3DModelLoader : public ModelLoader // documentation is at http://www.ini
                                 material = materials[materialIndex];
                                 material.texture = texture;
                             }
+                            warning(!isShaded, warningFunction, []()->string
+                            {
+                                return "material specified for non-shaded SURF";
+                            });
                             line = readTokenizedLine(is);
                         }
                         if(line[0] == "refs")
@@ -1056,7 +1060,7 @@ class AC3DModelLoader : public ModelLoader // documentation is at http://www.ini
             ColorF rgb = parseColorSpecifier(3, warningFunction);
             if(line[6] != "amb")
                 throw ModelLoadException("missing amb for " + line[0]);
-            ColorF amb = parseColorSpecifier(7, warningFunction);
+            ColorF amb = parseColorSpecifier(7, warningFunction, 0.2f);
             if(line[10] != "emis")
                 throw ModelLoadException("missing emis for " + line[0]);
             ColorF emis = parseColorSpecifier(11, warningFunction);

Diff for: render.cpp

@@ -1226,9 +1226,9 @@ const Driver drivers[] =
 #endif
     Driver("sdl", []()->shared_ptr<WindowRenderer>{return make_shared<SDLWindowRenderer>();}, makeSoftwareImageRenderer),
 #ifndef __EMSCRIPTEN__
+    Driver("svga", makeSVGARenderer, makeSoftwareImageRenderer),
     Driver("caca", makeCacaRenderer, makeSoftwareImageRenderer),
     Driver("aalib", makeLibAARenderer, makeSoftwareImageRenderer),
-    Driver("svga", makeSVGARenderer, makeSoftwareImageRenderer),
 #endif
     Driver("null", []()->shared_ptr<WindowRenderer>{return make_shared<NullWindowRenderer>();}, makeSoftwareImageRenderer),
 #ifndef __EMSCRIPTEN__

Diff for: svgarenderer.cpp

@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <thread>
+#include <stdio.h>
 
 using namespace std;
 
@@ -103,8 +104,23 @@ class SVGARenderer : public WindowRenderer
         static bool didInit = false;
         if(didInit)
             return;
+        const char *n = ttyname(0);
+        if(!n)
+            throw runtime_error("not running on a virtual console");
+        string ttyname = n;
+        string ttyprefix = "/dev/tty";
+        if(ttyname.substr(0, ttyprefix.size()) != ttyprefix || ttyname == ttyprefix)
+            throw runtime_error("not running on a virtual console");
+        for(char ch : ttyname.substr(ttyprefix.size()))
+        {
+            if(!isdigit(ch))
+                throw runtime_error("not running on a virtual console");
+        }
+        if(getuid() != 0 && geteuid() != 0)
+            throw runtime_error("not running as the root user");
         didInit = true;
-        vga_init();
+        if(0 != vga_init())
+            throw runtime_error("vga_init failed");
         atexit([](){vga_setmode(TEXT);});
     }
     void writeFrame()