cosmos 4.2.2-java → 4.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c14ef40a97dc9c1338ce893bfacee7ca95cae3fa08e5ac20c102458a9ddbacc1
-  data.tar.gz: e65d8815ff72d95e091698d29b5805eceaef39b57706e65904e1bfcb7c3ddfc9
+  metadata.gz: 168d12f64cd3babfdf1df0dd885e20b25c0810e12d660935f5f2f3d8121113fc
+  data.tar.gz: 218aa870e25cef9aaa45d8535013b2adcba73a0e7d3c506255d69ebf83c9bc35
 SHA512:
-  metadata.gz: 59e4c6d5a2a0e1475bf5b02f3c8b503bb7dd861aa4338da22684faa939beae3a6c91c2483d1e8efd2bbc244e883a059ed19217e4641693cf0f6b55a1d2adbf12
-  data.tar.gz: a4675fae23f403aa62978330c942c5f534b4e44dc32835d63e91277455d985edde624cf4ade9f896eb256bf1056f2402e68d88f6fa0ed366e7a1b867435b29a9
+  metadata.gz: 4400b6f9f2418138e0ab709246dd0701a20d4a1f977636ba5d73ae0e9361c3146d5d72447fba1f4e1481fe4b3a06ef978aec1593c8802430a6b07ff498367f37
+  data.tar.gz: fff150054bc49036d1c75857948ac23c72753ab1620d63a230545ae776aa84f7317717bcee8d718460791131031b22fec6939f8b8f73f3add8c699c4a10a8939

data/.travis.yml

@@ -6,7 +6,11 @@ services:
   - postgresql
 rvm:
   - jruby-9.1.14.0
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
+  - 2.5.1
+  - 2.4.4
+  - 2.3.3
+  - 2.2.6
+before_install:
+  - gem update --system
+  - gem install bundler
 script: bundle exec rake build spec

data/autohotkey/tools/cmd_sender.ahk

@@ -32,36 +32,36 @@ WinActivate Send Raw
 Click 310 105 ; Click OK CMD-10
 WinWaitActive Command Sender
 Sleep 500
-Click 85 75 ; Target dropdown CMD-1
+Click 85 100 ; Target dropdown CMD-1
 Sleep 500
-Click 610 75 ; Send CMD-2
+Click 610 100 ; Send CMD-2
 Sleep 500
-Click 365 75 ; Command dropdown CMD-1
+Click 365 100 ; Command dropdown CMD-1
 Sleep 500
-Click 365 140 ; Collect command CMD-3
+Click 365 165 ; Collect command CMD-3
 Sleep 500
-Click 610 75 ; Send should fail due to TYPE required CMD-6
+Click 610 100 ; Send should fail due to TYPE required CMD-6
 Sleep 500
 WinWaitActive Error
 Sleep 500
 Send {Enter}
-Click 240 185 ; Click in the TYPE parameter CMD-5
+Click 240 210 ; Click in the TYPE parameter CMD-5
 Sleep 500
 Send 5{Enter}
 Sleep 500
-Click 610 75 ; Send CMD-2
+Click 610 100 ; Send CMD-2
 Sleep 500
-Click 150 250 ; Click in the TEMP parameter
+Click 150 275 ; Click in the TEMP parameter
 Sleep 500
 Send 100{Enter}
 Sleep 500
-Click 150 185 ; Click on the TYPE parameter
+Click 150 210 ; Click on the TYPE parameter
 Sleep 500
-Click 150 185 ; Click on the TYPE parameter
+Click 150 210 ; Click on the TYPE parameter
 Sleep 500
-Click 150 200 ; Click on NORMAL CMD-4
+Click 150 225 ; Click on NORMAL CMD-4
 Sleep 500
-Click 610 75 ; Send should fail due to out of range
+Click 610 100 ; Send should fail due to out of range
 WinWaitActive Error
 Sleep 500
 Send {Enter}
@@ -71,9 +71,9 @@ Send !m ; Mode
 Sleep 500
 Send i ; Ignore Range Checks
 Sleep 500
-Click 610 75 ; Send should succeed
+Click 610 100 ; Send should succeed
 Sleep 500
-Click 150 250 ; Click in the TEMP parameter
+Click 150 275 ; Click in the TEMP parameter
 Sleep 500
 Send 10{Enter} ; Set it to an allowable value
 Sleep 500
@@ -81,27 +81,27 @@ Send !m ; Mode
 Sleep 500
 Send p ; Disable parameter conversions
 Sleep 500
-Click 610 75 ; Send should succeed
+Click 610 100 ; Send should succeed
 Sleep 500
 Send !m ; Mode
 Sleep 500
 Send i ; Ignore Range Checks CMD-7
 Sleep 500
-Click 610 75 ; Send should succeed CMD-7
+Click 610 100 ; Send should succeed CMD-7
 Sleep 500
-Click 150 185 ; Click on the TYPE parameter
+Click 150 210 ; Click on the TYPE parameter
 Sleep 500
-Click 150 185 ; Click on the TYPE parameter
+Click 150 210 ; Click on the TYPE parameter
 Sleep 500
-Click 150 214 ; Click on SPECIAL CMD-4
+Click 150 239 ; Click on SPECIAL CMD-4
 Sleep 500
-Click 610 75 ; Send
+Click 610 100 ; Send
 WinWaitActive Hazardous Command
 Sleep 500
 Click 290 110 ; Cancel CMD-11
 WinWaitActive Command Sender
 Sleep 500
-Click 610 75 ; Send
+Click 610 100 ; Send
 WinWaitActive Hazardous Command
 Sleep 500
 Send {Enter} ; Confirm send because hazardous CMD-11
@@ -115,41 +115,41 @@ Send !m ; Mode
 Sleep 500
 Send s ; Show Ignored CMD-9
 Sleep 500
-Click 275 365 ; Click in the TYPE parameter
+Click 275 390 ; Click in the TYPE parameter
 Sleep 500
 Send 5{Enter}
 Sleep 500
-Click 610 75 ; Send
+Click 610 100 ; Send
 Sleep 500
-Click right 500 365 ; Right Click in the TYPE parameter
+Click right 500 390 ; Right Click in the TYPE parameter
 Sleep 500
-Click right 515 350 ; Details
+Click right 515 375 ; Details
 WinWaitActive INST COLLECT
 Sleep 500
 Send {Enter}
 WinWaitActive Command Sender
 Sleep 500
-Click right 200 435 ; Click in TEMP
+Click right 200 460 ; Click in TEMP
 Sleep 500
-Click 215 450 ; Select File
+Click 215 475 ; Select File
 WinWaitActive Insert
 Sleep 500
 Send cmd.bin{Enter}
 WinWaitActive Command Sender
 Sleep 500
-Click 85 75 ; Target dropdown
+Click 85 100 ; Target dropdown
 Sleep 500
-Click 75 103 ; INST2
+Click 75 128 ; INST2
 Sleep 500
-Click 365 75 ; Command dropdown
+Click 365 100 ; Command dropdown
 Sleep 500
-Click 365 140 ; Collect command
+Click 365 165 ; Collect command
 Sleep 500
-Click 180 365 ; Click on Type
+Click 180 390 ; Click on Type
 Sleep 500
-Click 180 365 ; Click on Type
+Click 180 390 ; Click on Type
 Sleep 500
-Click 180 400 ; Click on Special
+Click 180 425 ; Click on Special
 Sleep 500
 Send !m ; Mode
 Sleep 500
@@ -163,7 +163,7 @@ Send !m ; Mode
 Sleep 500
 Send s ; Show Ignored
 Sleep 500
-Click 60 600 ; Click in the Command History
+Click 60 625 ; Click in the Command History
 Sleep 500
 Send {Down 6}{Up}{Enter}
 

data/bin/dart_import

@@ -1,2 +1,4 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
 require 'cosmos'
-require 'cosmos/dart/processes/dart_import'
+require 'cosmos/dart/processes/dart_import'

data/cosmos.gemspec

@@ -78,7 +78,7 @@ spec = Gem::Specification.new do |s|
 
   # Runtime Dependencies
   s.add_runtime_dependency 'bundler', '~> 1.3'
-  s.add_runtime_dependency 'rdoc', '>= 4', '< 6' # qtbindings doesn't parse in 6.0.0
+  s.add_runtime_dependency 'rdoc', '>= 4' # qtbindings doesn't parse in 6.0.0, fixed in 6.0.1
   s.add_runtime_dependency 'rake', '>= 10.0' # 10.0 released Nov 12, 2012
   s.add_runtime_dependency 'json', '>= 1.5', '< 3' # 2.0+ works with COSMOS
   s.add_runtime_dependency 'pry', '~> 0.9'
@@ -88,7 +88,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'snmp', '~> 1.0'
   s.add_runtime_dependency 'rubyzip', '~> 1.2'
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
-  s.add_runtime_dependency 'opengl', '~> 0.10' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_runtime_dependency 'opengl-bindings', '~> 1.6' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'puma', '~> 3.10'
   s.add_runtime_dependency 'rack', '~> 2.0'
@@ -98,7 +98,8 @@ spec = Gem::Specification.new do |s|
   #   "For MRI versions 2.2.7, 2.2.8, 2.3.4 and 2.4.1, you may see stream closed in
   #    another thread (IOError). It may be caused by a Ruby bug. It can be
   #    fixed with the gem https://rubygems.org/gems/stopgap_13632"
-  s.add_runtime_dependency 'stopgap_13632', '~> 1.1.1' if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.3.4 2.4.1).include? RUBY_VERSION  # MRI Only
+  # This is commented out because the gemspec is only evaluated at gem build time
+  # s.add_runtime_dependency 'stopgap_13632', '~> 1.1.1' if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.3.4 2.4.1).include? RUBY_VERSION  # MRI Only
 
   # Development Dependencies
   s.add_development_dependency 'diff-lcs', '~> 1.3' if RUBY_ENGINE == 'ruby' # Get latest for MRI

data/data/crc.txt

@@ -18,7 +18,7 @@
 "lib/cosmos/processors/processor.rb" 0x1FEB7030
 "lib/cosmos/processors/statistics_processor.rb" 0x514E4788
 "lib/cosmos/processors/watermark_processor.rb" 0x8829E260
-"lib/cosmos/version.rb" 0x7E836DC1
+"lib/cosmos/version.rb" 0x609CF1DC
 "lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4AA03555
 "lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0xC498CE81
 "lib/cosmos/conversions/processor_conversion.rb" 0xC72B73BD
@@ -70,18 +70,18 @@
 "lib/cosmos/gui/text/completion_text_edit.rb" 0x09A88429
 "lib/cosmos/gui/text/completion.rb" 0xB55DB949
 "lib/cosmos/gui/opengl/moon_model.rb" 0x9C1D696C
-"lib/cosmos/gui/opengl/opengl.rb" 0xBE4A454D
-"lib/cosmos/gui/opengl/gl_scene.rb" 0x82B75D87
+"lib/cosmos/gui/opengl/opengl.rb" 0x4165DA92
+"lib/cosmos/gui/opengl/gl_scene.rb" 0x24F22BA7
 "lib/cosmos/gui/opengl/earth_model.rb" 0x50D04F1F
-"lib/cosmos/gui/opengl/stl_reader.rb" 0xFAC1CA41
+"lib/cosmos/gui/opengl/stl_reader.rb" 0x05C1E979
 "lib/cosmos/gui/opengl/gl_bounds.rb" 0x3C40A91B
 "lib/cosmos/gui/opengl/gl_light.rb" 0x9B198652
-"lib/cosmos/gui/opengl/texture_mapped_sphere.rb" 0x60C65780
-"lib/cosmos/gui/opengl/stl_shape.rb" 0xB0EB0ECD
-"lib/cosmos/gui/opengl/gl_viewer.rb" 0x596D112A
+"lib/cosmos/gui/opengl/texture_mapped_sphere.rb" 0x2FAA909F
+"lib/cosmos/gui/opengl/stl_shape.rb" 0xAF328018
+"lib/cosmos/gui/opengl/gl_viewer.rb" 0xA50C5544
 "lib/cosmos/gui/opengl/gl_viewport.rb" 0xDCA4C43E
 "lib/cosmos/gui/opengl/gl_material.rb" 0xA9335A05
-"lib/cosmos/gui/opengl/gl_shape.rb" 0x1DE81D8A
+"lib/cosmos/gui/opengl/gl_shape.rb" 0xB1531BE7
 "lib/cosmos/gui/qt_tool.rb" 0x59F988CD
 "lib/cosmos/gui/qt.rb" 0x10480645
 "lib/cosmos/gui/utilities/analyze_log.rb" 0x5E13ABB0
@@ -108,7 +108,7 @@
 "lib/cosmos/packets/binary_accessor.rb" 0xCD678EF6
 "lib/cosmos/packets/packet.rb" 0x71A44396
 "lib/cosmos/packets/structure.rb" 0x4FB5B8D5
-"lib/cosmos/packets/commands.rb" 0xD310F0E6
+"lib/cosmos/packets/commands.rb" 0x36F95A2A
 "lib/cosmos/packets/limits_response.rb" 0xB836D388
 "lib/cosmos/packets/packet_config.rb" 0x9500DA95
 "lib/cosmos/packets/packet_item.rb" 0xE0789E45
@@ -224,7 +224,7 @@
 "lib/cosmos/tools/tlm_viewer/widgets/trendlimitsbar_widget.rb" 0xF812A1CC
 "lib/cosmos/tools/tlm_viewer/widgets/spacer_widget.rb" 0x2BBFF4CF
 "lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitscolumn_widget.rb" 0x83106C3B
-"lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb" 0x22C4F4C1
+"lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb" 0xA7D69022
 "lib/cosmos/tools/tlm_viewer/widgets/label_widget.rb" 0x5158C883
 "lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb" 0x0CDABB7D
 "lib/cosmos/tools/tlm_viewer/widgets/valuerangebar_widget.rb" 0xFD9A6967
@@ -298,7 +298,7 @@
 "lib/cosmos/tools/cmd_tlm_server/router_thread.rb" 0x5070D428
 "lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x3F3BDB60
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0xDFD9701E
-"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0xCAC1A6ED
+"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0x04BACB04
 "lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb" 0xE80FAD0A
 "lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb" 0xB192AF6E
 "lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0x0FE62D7A
@@ -342,7 +342,7 @@
 "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x9706590F
 "lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x729A16C4
 "lib/cosmos/tools/script_runner/script_runner.rb" 0x648F80BE
-"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x255C8DF0
+"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x0C54F330
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xAAEFBDF7
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0xD5A30025
 "lib/cosmos/dart/db/seeds.rb" 0xA69E6A23
@@ -428,7 +428,7 @@
 "lib/cosmos/dart/lib/dart_reducer_worker_thread.rb" 0x25A4631B
 "lib/cosmos/dart/lib/dart_decommutator.rb" 0x1B82D21E
 "lib/cosmos/dart/lib/dart_tcpip_server_interface.rb" 0xF3A295D4
-"lib/cosmos/dart/lib/dart_common.rb" 0x663EF102
+"lib/cosmos/dart/lib/dart_common.rb" 0x91514597
 "lib/cosmos/dart/lib/dart_database_cleaner.rb" 0xA67479FD
 "lib/cosmos/dart/lib/dart_packet_log_writer.rb" 0x968E3CF5
 "lib/cosmos/dart/lib/dart_decom_query.rb" 0x72B29872
@@ -439,7 +439,7 @@
 "lib/cosmos/config/config_parser.rb" 0x3CCA586C
 "lib/cosmos/config/meta_config_parser.rb" 0xE4521B6B
 "lib/cosmos/utilities/csv.rb" 0xF79582B8
-"lib/cosmos/utilities/ruby_lex_utils.rb" 0x340218C1
+"lib/cosmos/utilities/ruby_lex_utils.rb" 0x839105B3
 "lib/cosmos/utilities/crc.rb" 0xD9581AD2
 "lib/cosmos/utilities/low_fragmentation_array.rb" 0x265263E1
 "lib/cosmos/utilities/logger.rb" 0xDD74C6BE

data/demo/config/dart/Gemfile

@@ -7,7 +7,7 @@ end
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.1.4'
+gem 'rails', '~> 5.1.6'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
@@ -48,7 +48,7 @@ gem 'rest-client' # For examples
 gem 'childprocess'
 
 if RUBY_ENGINE == 'ruby'
-  gem 'pg', '~> 0.21'
+  gem 'pg', '~> 1.0'
 else
  gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
 end

data/demo/config/data/crc.txt

@@ -122,7 +122,7 @@
 "config/tools/handbook_creator/default_toc.xsl" 0x4122A040
 "config/tools/handbook_creator/handbook_creator.txt" 0xAA806C94
 "config/tools/script_runner/script_runner.txt" 0x1EECD803
-"config/dart/Gemfile" 0xE1222F76
+"config/dart/Gemfile" 0x69694DA8
 "tools/TlmExtractor.bat" 0x2B98E027
 "tools/Launcher" 0xFD4E356C
 "tools/CmdSequence" 0x4A13C82C

data/install/config/dart/Gemfile

@@ -7,7 +7,7 @@ end
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.1.4'
+gem 'rails', '~> 5.1.6'
 # Use sqlite3 as the database for Active Record
 # em 'sqlite3'
 # Use Puma as the app server
@@ -48,7 +48,7 @@ gem 'rest-client' # For examples
 gem 'childprocess'
 
 if RUBY_ENGINE == 'ruby'
-  gem 'pg', '~> 0.21'
+  gem 'pg', '~> 1.0'
 else
  gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
 end

data/install/config/data/crc.txt

@@ -3,13 +3,13 @@
 "config/targets/SYSTEM/cmd_tlm/meta_tlm.txt" 0x07CDABCB
 "config/data/README.txt" 0x93B2C07E
 "config/system/system.txt" 0xD95B7058
-"config/tools/launcher/launcher.txt" 0x9382FDCE
+"config/tools/launcher/launcher.txt" 0x6A3047DB
 "config/tools/table_manager/README.txt" 0x93B2C07E
 "config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
 "config/tools/data_viewer/data_viewer.txt" 0xAEE0B7DF
 "config/tools/test_runner/test_runner.txt" 0xD24409D2
 "config/tools/tlm_extractor/README.txt" 0x93B2C07E
-"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0x9B1D4372
+"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0x2A39E69F
 "config/tools/tlm_grapher/README.txt" 0x93B2C07E
 "config/tools/opengl_builder/README.txt" 0x93B2C07E
 "config/tools/limits_monitor/README.txt" 0x93B2C07E
@@ -29,7 +29,7 @@
 "config/tools/handbook_creator/default_toc.xsl" 0x4122A040
 "config/tools/handbook_creator/handbook_creator.txt" 0x64E4B5CC
 "config/tools/script_runner/script_runner.txt" 0x1EECD803
-"config/dart/Gemfile" 0x89E0F852
+"config/dart/Gemfile" 0x011A23A3
 "tools/TlmExtractor.bat" 0x2B98E027
 "tools/Launcher" 0xFD4E356C
 "tools/CmdSequence" 0x4A13C82C

data/lib/cosmos/dart/lib/dart_common.rb

@@ -258,7 +258,7 @@ module DartCommon
     end
     packet_id = packet_name_hash[packet_name] # Check cache
     unless packet_id
-      packet = sync_packet(target.id, packet_name, is_tlm)
+      packet = sync_packet(target_id, packet_name, is_tlm)
       packet_id = packet.id
       packet_name_hash[packet_name] = packet.id  # Update cache
     end

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

@@ -50,12 +50,12 @@ module Cosmos
     end
 
     def hit(viewer)
-      GL.PushName(0xffffffff);
+      glPushName(0xffffffff);
       @shapes.each_with_index do |shape, index|
-        GL.LoadName(index)
+        glLoadName(index)
         shape.hit(viewer)
       end
-      GL.PopName()
+      glPopName()
     end
 
     def identify(index)

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

@@ -45,45 +45,45 @@ module Cosmos
     end
 
     def draw(viewer)
-      GL.PushAttrib(GL::CURRENT_BIT | GL::LIGHTING_BIT | GL::POINT_BIT | GL::LINE_BIT)
-      GL.PushMatrix
+      glPushAttrib(OpenGL::GL_CURRENT_BIT | OpenGL::GL_LIGHTING_BIT | OpenGL::GL_POINT_BIT | OpenGL::GL_LINE_BIT)
+      glPushMatrix
 
       # Object position
-      GL::Translatef(@position[0], @position[1], @position[2])
+      glTranslatef(@position[0], @position[1], @position[2])
 
       # Shading
-      GL.Enable(GL::LIGHTING)
-      GL.Enable(GL::AUTO_NORMAL)
-      GL.ShadeModel(GL::SMOOTH)
+      glEnable(OpenGL::GL_LIGHTING)
+      glEnable(OpenGL::GL_AUTO_NORMAL)
+      glShadeModel(OpenGL::GL_SMOOTH)
 
       # Material
       if @back_material
-        GL.Material(GL::FRONT, GL::AMBIENT, @front_material.ambient)
-        GL.Material(GL::FRONT, GL::DIFFUSE, @front_material.diffuse)
-        GL.Material(GL::FRONT, GL::SPECULAR, @front_material.specular)
-        GL.Material(GL::FRONT, GL::EMISSION, @front_material.emission)
-        GL.Materialf(GL::FRONT, GL::SHININESS, @front_material.shininess)
-        GL.Material(GL::BACK, GL::AMBIENT, @back_material.ambient)
-        GL.Material(GL::BACK, GL::DIFFUSE, @back_material.diffuse)
-        GL.Material(GL::BACK, GL::SPECULAR, @back_material.specular)
-        GL.Material(GL::BACK, GL::EMISSION, @back_material.emission)
-        GL.Materialf(GL::BACK, GL::SHININESS, @back_material.shininess)
+        glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_AMBIENT, @front_material.ambient.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_DIFFUSE, @front_material.diffuse.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_SPECULAR, @front_material.specular.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_EMISSION, @front_material.emission.pack('F*'))
+        glMaterialfvf(OpenGL::GL_FRONT, OpenGL::GL_SHININESS, @front_material.shininess)
+        glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_AMBIENT, @back_material.ambient.pack('F*'))
+        glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_DIFFUSE, @back_material.diffuse.pack('F*'))
+        glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_SPECULAR, @back_material.specular.pack('F*'))
+        glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_EMISSION, @back_material.emission.pack('F*'))
+        glMaterialf(OpenGL::GL_BACK, OpenGL::GL_SHININESS, @back_material.shininess)
       else
-        GL.Material(GL::FRONT_AND_BACK, GL::AMBIENT, @front_material.ambient)
-        GL.Material(GL::FRONT_AND_BACK, GL::DIFFUSE, @front_material.diffuse)
-        GL.Material(GL::FRONT_AND_BACK, GL::SPECULAR, @front_material.specular)
-        GL.Material(GL::FRONT_AND_BACK, GL::EMISSION, @front_material.emission)
-        GL.Materialf(GL::FRONT_AND_BACK, GL::SHININESS, @front_material.shininess)
+        glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_AMBIENT, @front_material.ambient.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_DIFFUSE, @front_material.diffuse.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_SPECULAR, @front_material.specular.pack('F*'))
+        glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_EMISSION, @front_material.emission.pack('F*'))
+        glMaterialf(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_SHININESS, @front_material.shininess)
       end
 
       # Surface
-      GL.PolygonMode(GL::FRONT_AND_BACK, GL::FILL)
-      GL.Disable(GL::CULL_FACE);
+      glPolygonMode(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_FILL)
+      glDisable(OpenGL::GL_CULL_FACE);
       drawshape(viewer)
 
       # Restore attributes and matrix
-      GL.PopMatrix
-      GL.PopAttrib
+      glPopMatrix
+      glPopAttrib
     end
 
     # Draw the StlShape
@@ -144,7 +144,5 @@ module Cosmos
     def export
       raise "export must be defined by subclass"
     end
-
-  end # Shape
-
-end # module Cosmos
+  end
+end