cosmos 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86f4e70039dc9cf70198d05ebda498d13d0e6b09
-  data.tar.gz: c5aec1555af16993cbd5d0ca88c34006afb62242
+  metadata.gz: c086907a0e1bda08352520d1a264be73867cde38
+  data.tar.gz: 6ae05f354e92bb9331bbea4a49689580a3e78e9e
 SHA512:
-  metadata.gz: 81bc36f9c68266492a066981d0308a4c2a5c1d787edf6708251bd1944d68a76f39b33966cf73faf7bf291c503db8f7390c814a61f2bc54b1ea36574cdcd8fbf8
-  data.tar.gz: 5fd875fbd16981537682e0bba166b5921a919f96ac48a3557d486d05373f6f78a1426e58588c556a2e2553ec14e4a514a6b3668a82127b1814c5714a89a79b3f
+  metadata.gz: cac5dbce95e3e6893fb81f9bcb56738a7bd15c89e3e2f63aba7e04e5989cba2a5b3d3b9fb72230c1dc4f4a306fe71dd8d7b1e2948c1a2273bf613132cb9b3f42
+  data.tar.gz: 32ff6b4ff7946905dfc52dfe71d00978d76d3a333a2ec849cb441076bbca9f1e41c313ededa8931ff39fd3dd00fe17f0e344c1c8edb97e8e2286ed028722e69e

data/data/crc.txt

@@ -34,7 +34,7 @@
 "lib/cosmos/utilities/low_fragmentation_array.rb" 0x7E797C76
 "lib/cosmos/utilities/simulated_target.rb" 0x7EE7A3FF
 "lib/cosmos/gui/qt.rb" 0x090A21D1
-"lib/cosmos/gui/dialogs/find_replace_dialog.rb" 0x7D0348D1
+"lib/cosmos/gui/dialogs/find_replace_dialog.rb" 0xE5BA1A34
 "lib/cosmos/gui/dialogs/set_tlm_dialog.rb" 0x02A207C9
 "lib/cosmos/gui/dialogs/exception_dialog.rb" 0xEAC9F814
 "lib/cosmos/gui/dialogs/tlm_edit_dialog.rb" 0xCD877DDA
@@ -53,14 +53,14 @@
 "lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0x18B1DB71
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x5EC8FC5F
-"lib/cosmos/gui/utilities/script_module_gui.rb" 0xA5A34AF5
+"lib/cosmos/gui/utilities/script_module_gui.rb" 0x2AA7C2F8
 "lib/cosmos/gui/utilities/screenshot.rb" 0x65F75371
 "lib/cosmos/gui/widgets/full_text_search_line_edit.rb" 0x7AAF694C
 "lib/cosmos/gui/widgets/realtime_button_bar.rb" 0xEB0CE858
 "lib/cosmos/gui/widgets/packet_log_frame.rb" 0xF9312CBD
-"lib/cosmos/gui/line_graph/line_graph.rb" 0x6761DE9A
+"lib/cosmos/gui/line_graph/line_graph.rb" 0x15D29433
 "lib/cosmos/gui/line_graph/line_graph_popups.rb" 0x6B6BD351
-"lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0x718C2DDA
+"lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0xEC9FEECC
 "lib/cosmos/gui/line_graph/overview_graph.rb" 0x8FCDCE33
 "lib/cosmos/gui/line_graph/line_graph_dialog.rb" 0xF73F68CB
 "lib/cosmos/gui/line_graph/lines.rb" 0x871CA030
@@ -76,7 +76,7 @@
 "lib/cosmos/gui/opengl/gl_material.rb" 0xA2356712
 "lib/cosmos/gui/opengl/moon_model.rb" 0xC84B01EC
 "lib/cosmos/gui/opengl/stl_reader.rb" 0x791FB9EB
-"lib/cosmos/gui/opengl/gl_viewer.rb" 0xB7F640B8
+"lib/cosmos/gui/opengl/gl_viewer.rb" 0xCBFBC60C
 "lib/cosmos/gui/opengl/gl_scene.rb" 0x0EABB1A2
 "lib/cosmos/gui/opengl/gl_light.rb" 0xDF6C13EA
 "lib/cosmos/gui/opengl/earth_model.rb" 0xF5CC4C1D
@@ -91,15 +91,15 @@
 "lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
 "lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x6FEE12DB
-"lib/cosmos/tools/script_runner/script_runner.rb" 0xA5890428
+"lib/cosmos/tools/script_runner/script_runner.rb" 0x0CC0CBB4
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xB857FA4A
 "lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0x41CF52C2
 "lib/cosmos/tools/data_viewer/data_viewer_component.rb" 0x3525E13F
 "lib/cosmos/tools/data_viewer/dump_component.rb" 0x6942C5D6
-"lib/cosmos/tools/data_viewer/data_viewer.rb" 0x88E765D0
+"lib/cosmos/tools/data_viewer/data_viewer.rb" 0x53FF80A9
 "lib/cosmos/tools/launcher/launcher_multitool.rb" 0x1020A3D0
 "lib/cosmos/tools/launcher/launcher_tool.rb" 0xE2F186A7
-"lib/cosmos/tools/launcher/launcher_config.rb" 0xE41FF75C
+"lib/cosmos/tools/launcher/launcher_config.rb" 0x569C343D
 "lib/cosmos/tools/launcher/launcher.rb" 0xAF399283
 "lib/cosmos/tools/replay/replay_server.rb" 0x307A7329
 "lib/cosmos/tools/replay/replay.rb" 0x79D68481
@@ -127,7 +127,7 @@
 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x50E37D3B
 "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0x0321B411
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x859EC490
-"lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
+"lib/cosmos/tools/table_manager/table_manager.rb" 0x05E19031
 "lib/cosmos/tools/table_manager/table.rb" 0x923A8589
 "lib/cosmos/tools/table_manager/table_item.rb" 0x08A9A262
 "lib/cosmos/tools/table_manager/table_manager_core.rb" 0xE5C42A6A
@@ -143,7 +143,7 @@
 "lib/cosmos/tools/test_runner/test.rb" 0x264AB62E
 "lib/cosmos/tools/tlm_grapher/plots/xy_plot.rb" 0x98F7712F
 "lib/cosmos/tools/tlm_grapher/plots/singlexy_plot.rb" 0xA01649EC
-"lib/cosmos/tools/tlm_grapher/plots/linegraph_plot.rb" 0xF0F6A243
+"lib/cosmos/tools/tlm_grapher/plots/linegraph_plot.rb" 0x487D5301
 "lib/cosmos/tools/tlm_grapher/plots/plot.rb" 0xAD4F05B5
 "lib/cosmos/tools/tlm_grapher/data_object_editors/linegraph_data_object_editor.rb" 0xC23AA3F6
 "lib/cosmos/tools/tlm_grapher/data_object_editors/data_object_editor.rb" 0x6A92FD7C
@@ -162,12 +162,12 @@
 "lib/cosmos/tools/tlm_grapher/plot_editors/plot_editor.rb" 0x0C92BBB8
 "lib/cosmos/tools/tlm_grapher/plot_editors/xy_plot_editor.rb" 0x724D9469
 "lib/cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor.rb" 0xA9B7CD4C
-"lib/cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor.rb" 0x2DEFBC72
+"lib/cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor.rb" 0x38E79C34
 "lib/cosmos/tools/tlm_grapher/data_object_adders/housekeeping_data_object_adder.rb" 0xDC2B0DD3
 "lib/cosmos/tools/tlm_grapher/data_object_adders/singlexy_data_object_adder.rb" 0x74CEA56E
 "lib/cosmos/tools/tlm_grapher/data_object_adders/xy_data_object_adder.rb" 0x552F8C1F
 "lib/cosmos/tools/tlm_grapher/plot_gui_objects/singlexy_plot_gui_object.rb" 0x4FC1C15C
-"lib/cosmos/tools/tlm_grapher/plot_gui_objects/linegraph_plot_gui_object.rb" 0xC1B25F76
+"lib/cosmos/tools/tlm_grapher/plot_gui_objects/linegraph_plot_gui_object.rb" 0xBD8282FB
 "lib/cosmos/tools/tlm_grapher/plot_gui_objects/xy_plot_gui_object.rb" 0xA500650F
 "lib/cosmos/tools/tlm_grapher/data_objects/xy_data_object.rb" 0xCD684000
 "lib/cosmos/tools/tlm_grapher/data_objects/singlexy_data_object.rb" 0x1D037935
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x895983E9
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0xB014EBF0
+"lib/cosmos/version.rb" 0x52D8F90A
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -289,8 +289,8 @@
 "lib/cosmos/io/json_drb.rb" 0x495EB58B
 "lib/cosmos/io/stderr.rb" 0x401624AF
 "lib/cosmos/io/io_multiplexer.rb" 0xD183938D
-"lib/cosmos/io/win32_serial_driver.rb" 0xECBFE8FD
-"lib/cosmos/interfaces/linc_interface.rb" 0x77B8F1B2
+"lib/cosmos/io/win32_serial_driver.rb" 0xB5AF7D58
+"lib/cosmos/interfaces/linc_interface.rb" 0x2E216D93
 "lib/cosmos/interfaces/cmd_tlm_server_interface.rb" 0x36E0796A
 "lib/cosmos/interfaces/interface.rb" 0x060825FA
 "lib/cosmos/interfaces/stream_interface.rb" 0xDC602D7B
@@ -303,8 +303,8 @@
 "lib/cosmos/script/commands.rb" 0x58ABA373
 "lib/cosmos/script/telemetry.rb" 0x2AFB0DCB
 "lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95
-"lib/cosmos/script/scripting.rb" 0xB79087E5
-"lib/cosmos/script/tools.rb" 0x8565EDC5
+"lib/cosmos/script/scripting.rb" 0x36D00CDC
+"lib/cosmos/script/tools.rb" 0x18E9BE05
 "lib/cosmos/script/script.rb" 0xF1B3E1F2
 "lib/cosmos/script/extract.rb" 0xCF4666D3
 "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
@@ -312,7 +312,7 @@
 "lib/cosmos/core_ext/file.rb" 0x1309270C
 "lib/cosmos/core_ext/socket.rb" 0xB859FE77
 "lib/cosmos/core_ext/cosmos_io.rb" 0xF098AAE0
-"lib/cosmos/core_ext/array.rb" 0x0D89471A
+"lib/cosmos/core_ext/array.rb" 0x660BC482
 "lib/cosmos/core_ext/class.rb" 0x858C349B
 "lib/cosmos/core_ext/objectspace.rb" 0x2CDC9CA2
 "lib/cosmos/core_ext/math.rb" 0xEFD1636D
@@ -322,5 +322,5 @@
 "lib/cosmos/core_ext/exception.rb" 0x695F7020
 "lib/cosmos/core_ext/string.rb" 0xE82EACEE
 "lib/cosmos/core_ext/hash.rb" 0x99038BE1
-"lib/cosmos/core_ext/matrix.rb" 0xC7ABFF88
+"lib/cosmos/core_ext/matrix.rb" 0x9DDBCA0B
 "lib/cosmos.rb" 0x116E7B3E

data/lib/cosmos/core_ext/array.rb

@@ -205,7 +205,10 @@ class Array
   #   start_value and end_value
   def range_within(start_value, end_value)
     raise "end_value: #{end_value} must be greater than start_value: #{start_value}" if end_value < start_value
-    Range.new(index_gt_eq(start_value), index_lt_eq(end_value))
+    range = Range.new(index_gt_eq(start_value), index_lt_eq(end_value))
+    # Sometimes we get a backwards range so check for that and reverse it
+    range = Range.new(range.last, range.first) if range.last < range.first
+    range
   end
 
   if !(self.method_defined?(:sum))

data/lib/cosmos/core_ext/matrix.rb

@@ -141,6 +141,9 @@ class Matrix
         @rows[i][row] = x*r[i][0] + y*r[i][1] + z*r[i][2]
       end
     end
+    # Ensure the final row is floating point for consistency
+    @rows[3].map! {|x| x.to_f }
+    return self
   end
 
 end

data/lib/cosmos/gui/dialogs/find_replace_dialog.rb

@@ -19,54 +19,60 @@ module Cosmos
     include Singleton
 
     # Displays a Find dialog
-    # @param text [Qt::PlainTextEdit] Dialog parent
-    def self.show_find(text)
-      self.instance.show_find(text)
+    # @param parent [Qt::Widget] Dialog parent which must implement a
+    #   search_text method which returns a String to search on
+    def self.show_find(parent)
+      self.instance.show_find(parent)
     end
-    def show_find(text)
+    def show_find(parent)
+      @parent = parent
       disable_replace
-      show_dialog(text)
+      show_dialog
     end
 
     # Displays a Find/Replace dialog
-    # @param text [Qt::PlainTextEdit] Dialog parent
-    def self.show_replace(text)
-      self.instance.show_replace(text)
+    # @param parent [Qt::Widget] Dialog parent which must implement a
+    #   search_text method which returns a String to search on
+    def self.show_replace(parent)
+      self.instance.show_replace(parent)
     end
-    def show_replace(text)
+    def show_replace(parent)
+      @parent = parent
       enable_replace
-      show_dialog(text)
+      show_dialog
     end
 
-    # @param text [Qt::PlainTextEdit] Text widget to search
-    def self.find_next(text)
-      self.instance.find_next(text)
+    # @param parent [#search_text] Object which must implement a
+    #   search_text method which returns a String to search on
+    def self.find_next(parent)
+      self.instance.find_next(parent)
     end
-    def find_next(text)
+    def find_next(parent)
       flags = find_flags()
       flags &= ~Qt::TextDocument::FindBackward.to_i
-      found = text.find(find_text(), flags)
+      found = parent.search_text.find(find_text(), flags)
       if not found and wrap_around?
-        cursor = text.textCursor
+        cursor = parent.search_text.textCursor
         cursor.movePosition(Qt::TextCursor::Start)
-        text.setTextCursor(cursor)
-        text.find(find_text(), flags)
+        parent.search_text.setTextCursor(cursor)
+        parent.search_text.find(find_text(), flags)
       end
     end
 
-    # @param text [Qt::PlainTextEdit] Text widget to search
-    def self.find_previous(text)
-      self.instance.find_previous(text)
+    # @param parent [#search_text] Object which must implement a
+    #   search_text method which returns a String to search on
+    def self.find_previous(parent)
+      self.instance.find_previous(parent)
     end
-    def find_previous(text)
+    def find_previous(parent)
       flags = find_flags()
       flags |= Qt::TextDocument::FindBackward.to_i
-      found = text.find(find_text(), flags)
+      found = parent.search_text.find(find_text(), flags)
       if not found and wrap_around?
-        cursor = text.textCursor
+        cursor = parent.search_text.textCursor
         cursor.movePosition(Qt::TextCursor::End)
-        text.setTextCursor(cursor)
-        text.find(find_text(), flags)
+        parent.search_text.setTextCursor(cursor)
+        parent.search_text.find(find_text(), flags)
       end
     end
 
@@ -156,10 +162,10 @@ module Cosmos
       button_layout
     end
 
-    def show_dialog(text)
+    def show_dialog
       @find_box.selectAll
       @find_box.setFocus(Qt::PopupFocusReason)
-      setParent(text, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | 3)
+      setParent(@parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | 3)
       show()
     end
 
@@ -198,7 +204,7 @@ module Cosmos
     end
 
     def handle_find_next
-      text = parentWidget
+      text = @parent.search_text
       found = text.find(find_text, find_flags)
       if not found and wrap_around?
         cursor = text.textCursor
@@ -213,7 +219,7 @@ module Cosmos
     end
 
     def handle_replace
-      text = parentWidget
+      text = @parent.search_text
       if text.textCursor.hasSelection &&
         text.textCursor.selectedText == find_text
         found = true
@@ -231,17 +237,18 @@ module Cosmos
         end
       end
       if found
-        text.textCursor.removeSelectedText
-        text.textCursor.insertText(replace_text)
         cursor = text.textCursor
-        cursor.setPosition(cursor.position-1)
-        cursor.select(Qt::TextCursor::WordUnderCursor)
+        cursor.removeSelectedText
+        position = cursor.position
+        cursor.insertText(replace_text)
+        # Move the cursor back over the inserted text to select it
+        cursor.movePosition(Qt::TextCursor::PreviousCharacter, Qt::TextCursor::KeepAnchor, replace_text.length)
         text.setTextCursor(cursor)
       end
     end
 
     def handle_replace_all
-      text = parentWidget
+      text = @parent.search_text
       cursor = text.textCursor
       # Start the edit block so this can be all undone with a single undo step
       cursor.beginEditBlock

data/lib/cosmos/gui/line_graph/line_graph.rb

@@ -79,6 +79,8 @@ module Cosmos
     attr_accessor_with_redraw :show_popup_x_y
     # Use x_value as floating point UTC timestamp with unix epoch
     attr_accessor_with_redraw :unix_epoch_x_values
+    # Display x_value as UTC timestamp
+    attr_accessor_with_redraw :utc_time
 
     #########################################################################
     # Callback attributes
@@ -145,6 +147,7 @@ module Cosmos
       @ordered_x_values = true
       @show_popup_x_y = false
       @unix_epoch_x_values = true
+      @utc_time = false
 
       # Initialize the callbacks
       @draw_cursor_line_callback = nil

data/lib/cosmos/gui/line_graph/line_graph_drawing.rb

@@ -247,7 +247,9 @@ module Cosmos
     def convert_x_value_to_text(value, max_characters)
       if !@show_popup_x_y and @unix_epoch_x_values
         if (value > 1 and value < 2147483647)
-          text = Time.at(value.to_f).formatted(false) # no year
+          time = Time.at(value.to_f)
+          time = time.utc if @utc_time
+          text = time.formatted(false) # no year
         else
           text = value.to_s
         end

data/lib/cosmos/gui/opengl/gl_viewer.rb

@@ -302,29 +302,11 @@ module Cosmos
       # Preferred blend over background
       GL.BlendFunc(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA)
 
-      # Light on
-      GL.Enable(GL::LIGHT0)
-      GL.Light(GL::LIGHT0, GL::AMBIENT, @light.ambient)
-      GL.Light(GL::LIGHT0, GL::DIFFUSE, @light.diffuse)
-      GL.Light(GL::LIGHT0, GL::SPECULAR, @light.specular)
-      GL.Light(GL::LIGHT0, GL::POSITION, @light.position)
-      GL.Light(GL::LIGHT0, GL::SPOT_DIRECTION, @light.direction)
-      GL.Lightf(GL::LIGHT0, GL::SPOT_EXPONENT, @light.exponent)
-      GL.Lightf(GL::LIGHT0, GL::SPOT_CUTOFF, @light.cutoff)
-      GL.Lightf(GL::LIGHT0, GL::CONSTANT_ATTENUATION, @light.c_attn)
-      GL.Lightf(GL::LIGHT0, GL::LINEAR_ATTENUATION, @light.l_attn)
-      GL.Lightf(GL::LIGHT0, GL::QUADRATIC_ATTENUATION, @light.q_attn)
-
+      enable_light(@light)
       # Viewer is close
       GL.LightModeli(GL::LIGHT_MODEL_LOCAL_VIEWER, 1)
 
-      # Material colors
-      GL.Material(GL::FRONT_AND_BACK, GL::AMBIENT, @material.ambient)
-      GL.Material(GL::FRONT_AND_BACK, GL::DIFFUSE, @material.diffuse)
-      GL.Material(GL::FRONT_AND_BACK, GL::SPECULAR, @material.specular)
-      GL.Material(GL::FRONT_AND_BACK, GL::EMISSION, @material.emission)
-      GL.Materialf(GL::FRONT_AND_BACK, GL::SHININESS, @material.shininess)
-
+      enable_material(@material)
       # Vertex colors change both diffuse and ambient
       GL.ColorMaterial(GL::FRONT_AND_BACK, GL::AMBIENT_AND_DIFFUSE)
       GL.Disable(GL::COLOR_MATERIAL)
@@ -349,8 +331,59 @@ module Cosmos
     def paintGL
       # Set viewport
       GL.Viewport(0, 0, @wvt.w, @wvt.h)
+      reset_gl_state()
+      clear_solid_background()
+
+      # Depth test on by default
+      GL.DepthMask(GL::TRUE)
+      GL.Enable(GL::DEPTH_TEST)
 
-      # Reset important stuff
+      # Switch to projection matrix
+      GL.MatrixMode(GL::PROJECTION)
+      GL.LoadIdentity
+      case @projection
+      when :PARALLEL
+        GL.Ortho(@wvt.left, @wvt.right, @wvt.bottom, @wvt.top, @wvt.hither, @wvt.yon)
+      when :PERSPECTIVE
+        GL.Frustum(@wvt.left, @wvt.right, @wvt.bottom, @wvt.top, @wvt.hither, @wvt.yon)
+      end
+
+      # Switch to model matrix
+      GL.MatrixMode(GL::MODELVIEW)
+      GL.LoadIdentity
+
+      enable_light(@light)
+      enable_material(@material)
+
+      # Color commands change both
+      GL.ColorMaterial(GL::FRONT_AND_BACK, GL::AMBIENT_AND_DIFFUSE)
+      # Global ambient light
+      GL.LightModel(GL::LIGHT_MODEL_AMBIENT, @ambient)
+
+      # Enable fog
+      if @options.include?(:VIEWER_FOG)
+        GL.Enable(GL::FOG)
+        GL.Fog(GL::FOG_COLOR, @top_background) # Disappear into the background
+        GL.Fogf(GL::FOG_START, (@distance - @diameter).to_f) # Range tight around model position
+        GL.Fogf(GL::FOG_END, (@distance + @diameter).to_f) # Far place same as clip plane:- clipped stuff is in the mist!
+        GL.Fogi(GL::FOG_MODE, GL::LINEAR) # Simple linear depth cueing
+      end
+
+      # Dithering
+      GL.Enable(GL::DITHER) if @options.include?(:VIEWER_DITHER)
+      # Enable lighting
+      GL.Enable(GL::LIGHTING) if @options.include?(:VIEWER_LIGHTING)
+
+      # Set model matrix
+      GL.LoadMatrixf(@transform)
+
+      draw_axis() if (@draw_axis and @draw_axis > 0)
+
+      # Draw what's visible
+      @scene.draw(self) if @scene
+    end
+
+    def reset_gl_state
       GL.ShadeModel(GL::SMOOTH)
       GL.PolygonMode(GL::FRONT_AND_BACK, GL::FILL)
       GL.Disable(GL::LIGHTING)
@@ -370,8 +403,9 @@ module Cosmos
       GL.LoadIdentity
       GL.MatrixMode(GL::MODELVIEW)
       GL.LoadIdentity
+    end
 
-      # Clear to solid background
+    def clear_solid_background
       GL.ClearDepth(1.0)
       GL.ClearColor(@top_background[0], @top_background[1], @top_background[2], @top_background[3])
       if @top_background == @bottom_background
@@ -397,105 +431,61 @@ module Cosmos
           # Raises false error on Mac
         end
       end
+    end
 
-      # Depth test on by default
-      GL.DepthMask(GL::TRUE)
-      GL.Enable(GL::DEPTH_TEST)
-
-      # Switch to projection matrix
-      GL.MatrixMode(GL::PROJECTION)
-      GL.LoadIdentity
-      case @projection
-      when :PARALLEL
-        GL.Ortho(@wvt.left, @wvt.right, @wvt.bottom, @wvt.top, @wvt.hither, @wvt.yon)
-      when :PERSPECTIVE
-        GL.Frustum(@wvt.left, @wvt.right, @wvt.bottom, @wvt.top, @wvt.hither, @wvt.yon)
-      end
-
-      # Switch to model matrix
-      GL.MatrixMode(GL::MODELVIEW)
-      GL.LoadIdentity
+    def draw_axis
+      GL.PushMatrix
+        GL.LineWidth(2.5)
+        GL.Color3f(1.0, 0.0, 0.0)
+        GL.Begin(GL::LINES)
+          GL.Vertex3f(-@draw_axis.to_f, 0.0, 0.0)
+          GL.Vertex3f(@draw_axis.to_f, 0.0, 0.0)
+        begin
+          GL.End
+        rescue
+          # Raises false error on Mac
+        end
+        GL.Color3f(0.0, 1.0, 0.0)
+        GL.Begin(GL::LINES)
+          GL.Vertex3f(0, -@draw_axis, 0.0)
+          GL.Vertex3f(0, @draw_axis, 0)
+        begin
+          GL.End
+        rescue
+          # Raises false error on Mac
+        end
+        GL.Color3f(0.0, 0.0, 1.0)
+        GL.Begin(GL::LINES)
+          GL.Vertex3f(0, 0, -@draw_axis)
+          GL.Vertex3f(0, 0, @draw_axis)
+        begin
+          GL.End
+        rescue
+          # Raises false error on Mac
+        end
+      GL.PopMatrix
+    end
 
-      # Set light parameters
+    def enable_light(light)
       GL.Enable(GL::LIGHT0)
-      GL.Light(GL::LIGHT0, GL::AMBIENT, @light.ambient)
-      GL.Light(GL::LIGHT0, GL::DIFFUSE, @light.diffuse)
-      GL.Light(GL::LIGHT0, GL::SPECULAR, @light.specular)
-      GL.Light(GL::LIGHT0, GL::POSITION, @light.position)
-      GL.Light(GL::LIGHT0, GL::SPOT_DIRECTION, @light.direction)
-      GL.Lightf(GL::LIGHT0, GL::SPOT_EXPONENT, @light.exponent)
-      GL.Lightf(GL::LIGHT0, GL::SPOT_CUTOFF, @light.cutoff)
-      GL.Lightf(GL::LIGHT0, GL::CONSTANT_ATTENUATION, @light.c_attn)
-      GL.Lightf(GL::LIGHT0, GL::LINEAR_ATTENUATION, @light.l_attn)
-      GL.Lightf(GL::LIGHT0, GL::QUADRATIC_ATTENUATION, @light.q_attn)
-
-      # Default material colors
-      GL.Material(GL::FRONT_AND_BACK, GL::AMBIENT, @material.ambient)
-      GL.Material(GL::FRONT_AND_BACK, GL::DIFFUSE, @material.diffuse)
-      GL.Material(GL::FRONT_AND_BACK, GL::SPECULAR, @material.specular)
-      GL.Material(GL::FRONT_AND_BACK, GL::EMISSION, @material.emission)
-      GL.Materialf(GL::FRONT_AND_BACK, GL::SHININESS, @material.shininess)
-
-      # Color commands change both
-      GL.ColorMaterial(GL::FRONT_AND_BACK, GL::AMBIENT_AND_DIFFUSE)
-
-      # Global ambient light
-      GL.LightModel(GL::LIGHT_MODEL_AMBIENT, @ambient)
-
-      # Enable fog
-      if @options.include?(:VIEWER_FOG)
-        GL.Enable(GL::FOG)
-        GL.Fog(GL::FOG_COLOR, @top_background) # Disappear into the background
-        GL.Fogf(GL::FOG_START, (@distance - @diameter).to_f) # Range tight around model position
-        GL.Fogf(GL::FOG_END, (@distance + @diameter).to_f) # Far place same as clip plane:- clipped stuff is in the mist!
-        GL.Fogi(GL::FOG_MODE, GL::LINEAR) # Simple linear depth cueing
-      end
-
-      # Dithering
-      GL.Enable(GL::DITHER) if @options.include?(:VIEWER_DITHER)
-
-      # Enable lighting
-      GL.Enable(GL::LIGHTING) if @options.include?(:VIEWER_LIGHTING)
-
-      # Set model matrix
-      GL.LoadMatrixf(@transform)
-
-      if (@draw_axis and @draw_axis > 0)
-        # Draw axis
-        GL.PushMatrix
-          GL.LineWidth(2.5)
-          GL.Color3f(1.0, 0.0, 0.0)
-          GL.Begin(GL::LINES)
-            GL.Vertex3f(-@draw_axis.to_f, 0.0, 0.0)
-            GL.Vertex3f(@draw_axis.to_f, 0.0, 0.0)
-          begin
-            GL.End
-          rescue
-            # Raises false error on Mac
-          end
-          GL.Color3f(0.0, 1.0, 0.0)
-          GL.Begin(GL::LINES)
-            GL.Vertex3f(0, -@draw_axis, 0.0)
-            GL.Vertex3f(0, @draw_axis, 0)
-          begin
-            GL.End
-          rescue
-            # Raises false error on Mac
-          end
-          GL.Color3f(0.0, 0.0, 1.0)
-          GL.Begin(GL::LINES)
-            GL.Vertex3f(0, 0, -@draw_axis)
-            GL.Vertex3f(0, 0, @draw_axis)
-          begin
-            GL.End
-          rescue
-            # Raises false error on Mac
-          end
-        GL.PopMatrix
-      end
-
-      # Draw what's visible
-      @scene.draw(self) if @scene
+      GL.Light(GL::LIGHT0, GL::AMBIENT, light.ambient)
+      GL.Light(GL::LIGHT0, GL::DIFFUSE, light.diffuse)
+      GL.Light(GL::LIGHT0, GL::SPECULAR, light.specular)
+      GL.Light(GL::LIGHT0, GL::POSITION, light.position)
+      GL.Light(GL::LIGHT0, GL::SPOT_DIRECTION, light.direction)
+      GL.Lightf(GL::LIGHT0, GL::SPOT_EXPONENT, light.exponent)
+      GL.Lightf(GL::LIGHT0, GL::SPOT_CUTOFF, light.cutoff)
+      GL.Lightf(GL::LIGHT0, GL::CONSTANT_ATTENUATION, light.c_attn)
+      GL.Lightf(GL::LIGHT0, GL::LINEAR_ATTENUATION, light.l_attn)
+      GL.Lightf(GL::LIGHT0, GL::QUADRATIC_ATTENUATION, light.q_attn)
+    end
+
+    def enable_material(material)
+      GL.Material(GL::FRONT_AND_BACK, GL::AMBIENT, material.ambient)
+      GL.Material(GL::FRONT_AND_BACK, GL::DIFFUSE, material.diffuse)
+      GL.Material(GL::FRONT_AND_BACK, GL::SPECULAR, material.specular)
+      GL.Material(GL::FRONT_AND_BACK, GL::EMISSION, material.emission)
+      GL.Materialf(GL::FRONT_AND_BACK, GL::SHININESS, material.shininess)
     end
 
     def resizeGL(width, height)
@@ -522,20 +512,18 @@ module Cosmos
       [@worldpx*sx.to_f + @ax, @ay - @worldpx*sy.to_f, -@distance.to_f]
     end
 
-    def eyeToWorld(e)
-      [e[0]*@itransform[0][0] + e[1]*@itransform[1][0] + e[2]*@itransform[2][0] + @itransform[3][0],
-       e[0]*@itransform[0][1] + e[1]*@itransform[1][1] + e[2]*@itransform[2][1] + @itransform[3][1],
-       e[0]*@itransform[0][2] + e[1]*@itransform[1][2] + e[2]*@itransform[2][2] + @itransform[3][2]]
-    end
-
     def worldToEyeZ(w)
       w[0]*@transform[0][2] + w[1]*@transform[1][2] + w[2]*@transform[2][2] + @transform[3][2]
     end
 
+    def eyeToWorld(e)
+      calc_prime(e)
+    end
+
     def calc_prime(v)
-      return [v[0]*@itransform[0][0] + v[1]*@itransform[1][0] + v[2]*@itransform[2][0] + @itransform[3][0],
-              v[0]*@itransform[0][1] + v[1]*@itransform[1][1] + v[2]*@itransform[2][1] + @itransform[3][1],
-              v[0]*@itransform[0][2] + v[1]*@itransform[1][2] + v[2]*@itransform[2][2] + @itransform[3][2]]
+      [v[0]*@itransform[0][0] + v[1]*@itransform[1][0] + v[2]*@itransform[2][0] + @itransform[3][0],
+       v[0]*@itransform[0][1] + v[1]*@itransform[1][1] + v[2]*@itransform[2][1] + @itransform[3][1],
+       v[0]*@itransform[0][2] + v[1]*@itransform[1][2] + v[2]*@itransform[2][2] + @itransform[3][2]]
     end
 
     def worldVector(fx, fy, tx, ty)