disp3D 0.2.1 → 1.0.1

data/test/test_picker.rb

@@ -11,7 +11,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     gl_view.world_scene_graph.add(rect_node)
     gl_view.fit
 
-    picked_result = gl_view.picker.pick(200,149)
+    picked_result = gl_view.picker.point_pick(200,149)
     assert_equal(1, picked_result.size)
     picked_world_pos = picked_result[0].world_position
 
@@ -26,7 +26,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     translate = Vector3.new(0.1, -0.3, 0.0)
     gl_view.camera.pre_translate = translate
 
-    picked_result = gl_view.picker.pick(200,149)
+    picked_result = gl_view.picker.point_pick(200,149)
     assert_equal(1, picked_result.size)
     picked_world_pos = picked_result[0].world_position
     assert_in_delta(-0.1, picked_world_pos.x, precision)
@@ -39,7 +39,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     translate = Vector3.new(10, -3, 0.0)
     gl_view.camera.pre_translate = translate
 
-    picked_result = gl_view.picker.pick(200,149)
+    picked_result = gl_view.picker.point_pick(200,149)
     assert_equal(0, picked_result.size)
   end
 
@@ -50,7 +50,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     gl_view.world_scene_graph.add(box_node)
     gl_view.fit
 
-    picked_result = gl_view.picker.pick(200,149)
+    picked_result = gl_view.picker.point_pick(200,149)
     assert_equal(1, picked_result.size)
     picked_world_pos = picked_result[0].world_position
 
@@ -64,7 +64,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     # rotate model
     angle_45 = 45.0*Math::PI/180.0
     gl_view.camera.rotate = Quat.from_axis(Vector3.new(1,0,0), angle_45)
-    picked_result = gl_view.picker.pick(200,149)
+    picked_result = gl_view.picker.point_pick(200,149)
 
     assert_equal(1, picked_result.size)
     picked_world_pos = picked_result[0].world_position
@@ -86,7 +86,7 @@ class PickerTestCase < MiniTest::Unit::TestCase
     gl_view.fit
 
     precision = 0.001
-    picked_results = gl_view.picker.pick(200,149)
+    picked_results = gl_view.picker.point_pick(200,149)
     assert_equal(2, picked_results.size)
     picked_results.each do |picked|
       assert_equal(1, picked.node_path_info.size)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disp3D
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21377964 !ruby/object:Gem::Requirement
+  requirement: &22795224 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21377964
+  version_requirements: *22795224
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21377292 !ruby/object:Gem::Requirement
+  requirement: &22794864 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21377292
+  version_requirements: *22794864
 - !ruby/object:Gem::Dependency
   name: gmath3D
-  requirement: &21353184 !ruby/object:Gem::Requirement
+  requirement: &22794396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21353184
+  version_requirements: *22794396
 - !ruby/object:Gem::Dependency
   name: ruby-opengl
-  requirement: &21352356 !ruby/object:Gem::Requirement
+  requirement: &22793940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.60.1
   type: :development
   prerelease: false
-  version_requirements: *21352356
+  version_requirements: *22793940
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &21351456 !ruby/object:Gem::Requirement
+  requirement: &22793388 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,19 +65,19 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21351456
+  version_requirements: *22793388
 description: disp3D provide 3D GUI framework
 email: toshi0328@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - disp3D.gemspec
@@ -86,11 +86,6 @@ files:
 - example/stl_viewer/main.rb
 - example/stl_viewer/qt_widget_controller.rb
 - example/stl_viewer/stl_viewer.rb
-- example/test/capture_test.rb
-- example/test/data/test.png
-- example/test/data/test2.jpg
-- example/test/dsl_test.rb
-- example/test/texture_test.rb
 - example/tutorial/01_helloworld.rb
 - example/tutorial/02_elements.rb
 - example/tutorial/03_CameraScene.rb
@@ -99,7 +94,16 @@ files:
 - example/tutorial/06_FileParser.rb
 - example/tutorial/07_SceneGraph.rb
 - example/tutorial/08_SceneGraph2.rb
+- example/tutorial/09_Texture.rb
+- example/tutorial/10_Animation.rb
+- example/tutorial/10_AnimationQt.rb
+- example/tutorial/11_MultiView.rb
+- example/tutorial/12_Light.rb
+- example/tutorial/13_RectPick.rb
+- example/tutorial/14_LineRubberband.rb
 - example/tutorial/data/bunny.stl
+- example/tutorial/data/test.png
+- example/tutorial/data/test2.jpg
 - lib/camera.rb
 - lib/compass.rb
 - lib/disp3D.rb
@@ -112,12 +116,14 @@ files:
 - lib/node/node.rb
 - lib/node/node_arrows.rb
 - lib/node/node_collection.rb
+- lib/node/node_cone.rb
 - lib/node/node_coord.rb
 - lib/node/node_leaf.rb
 - lib/node/node_lines.rb
 - lib/node/node_points.rb
 - lib/node/node_polylines.rb
 - lib/node/node_rectangle.rb
+- lib/node/node_sphere.rb
 - lib/node/node_tea_pod.rb
 - lib/node/node_text.rb
 - lib/node/node_tris.rb
@@ -128,8 +134,6 @@ files:
 - lib/qt_widget_gl.rb
 - lib/scene_graph.rb
 - lib/stl.rb
-- test/data/binary_test.stl
-- test/data/bunny-flatfoot.stl
 - test/data/cube-ascii.stl
 - test/data/cube-binary.stl
 - test/helper.rb
@@ -167,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1037830061
+      hash: 97386611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: disp3D provide 3D GUI framework.

data/README.rdoc

@@ -1,63 +0,0 @@
-= disp3D
-本ライブラリは、Qtと組み合わせて、3次元の表示が簡単に可能なフレームワークを提供する目的で開発されています。ターゲットは、簡単なアプリ、プロトタイピング、学術利用などを想定しています。
-
-以下のような特徴を持つようなライブラリを目指します。
-- シンプルで使いやすく！
-- Rubyでの開発が可能
-- windows,mac,linuxなどプラットフォームを問わない
-
-また、ゲーム、CGや大規模モデルなどは当面の目標からは外れます。
-
-== インストール
-ライブラリは以下の３つのgemに依存しています。
-- gmath3D
-- ruby-opengl
-- rmagick
-- qtbindings(オプション)
-
-== 使い方
-=== 例
-1.点や線を３次元ビュー上に追加し、表示する
-開発中
-
-2.Qtアプリケーションとして開発をする
-開発中
-
-3.STLファイルを読み込み、表示する
-開発中
-
-4.表示要素をマウス操作で取得する
-開発中
-
-=== データ構造
-中心となるクラスは、GLViewおよびSceneGraphです。
-執筆中
-
-== 今後の課題
-=== 開発項目
-- デモアプリ（STLビューワー）
-　- QTでのアプリケーション設計
-　- tri_nodeの法線方向指定
-- インディケート処理の追加
-- trackball manipulatorを洗練させる
-　- 回転中心を変えるとか・・・
-- DSLの設計
-- 自動テスト構築
-- Windowsでの利用(なぜか、インストールでエラー・・・)
-- ライティングの工夫、表示の洗練
-- ドキュメント整理(html?)
-- テクスチャの貼り付け
-- データの可視化としての応用
-- アニメーション
-- モバイル応用
-
-=== 他ライブラリとの組み合わせ
-- 3次元画像処理,pclの利用
-- 医用応用として、DICOMパーサー(Ruby-DICOM)の利用
-- 2次元画像処理、RMagicに任せる・・・（Ruby-DICOMとのつなぎなど）
-
-== Copyright
-
-Copyright (c) 2011 Toshiyasu Shimizu. See LICENSE.txt for
-further details.
-

data/example/test/capture_test.rb

@@ -1,16 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
-require 'disp3D'
-
-main_view = Disp3D::GLUTWindow.new(400,300)
-node_tea_pod = Disp3D::NodeTeaPod.new(5)
-node_tea_pod.material_color = [1,1,0,1]
-main_view.world_scene_graph.add(node_tea_pod)
-main_view.camera.is_orth = true
-main_view.fit
-angle = 30.0/180.0*Math::PI
-main_view.camera.rotate = Quat.from_axis(Vector3.new(1,0.5,0.0).normalize, angle)
-
-image = main_view.capture
-image.write File.dirname(__FILE__) + '/data/captured.png'
-
-main_view.start

data/example/test/dsl_test.rb

@@ -1,46 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
-
-require 'disp3D'
-
-main_view = Disp3D::GLUTWindow.new(600,400)
-
-Disp3D::NodeCollection.create :root_node do
-  add_new :type => :Points,
-          :geom => Vector3.new(0,0,0),
-          :colors => [1,1,0,1],
-          :size => 5
-
-  add_new :type => :Lines,
-          :name => :line1,
-          :geom => FiniteLine.new(Vector3.new(-1, 1, 0),Vector3.new(1, 1, 0)),
-          :width => 3
-
-  add_new :sub_node do
-    transform :pre_translate => Vector3.new(0,0,-1)
-    add_new :type => :Points,
-            :geom => Vector3.new(0,0,0),
-            :colors => [1,0,0,1],
-            :size => 3
-
-    add :line1
-  end
-
-  # "add_new" is as same as "create" and "add" process
-  create :type => :Polylines,
-         :name => :polyline1,
-         :geom => Polyline.new([Vector3.new(-1,0,0), Vector3.new(1,0,0), Vector3.new(1,3,0)]),
-         :colors => [0,1,0,1],
-         :width => 4
-
-  add :polyline1
-end
-
-main_view.world_scene_graph.add(:root_node)
-
-main_view.world_scene_graph.open do
-  add_new :type => :TeaPod,
-          :material_color => [0,0,1,1],
-          :post_translate => Vector3.new(0,0,-4),
-          :size => 3
-end
-main_view.start

data/example/test/texture_test.rb

@@ -1,39 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
-require 'disp3D'
-
-main_view = Disp3D::GLUTWindow.new(600,400)
-
-#=========================
-# load image
-file_path1 = File.dirname(__FILE__) + '/data/test.png'
-image1 = Magick::Image.read(file_path1).first
-
-#=========================
-# rect
-original_point = Vector3.new(0,0,0)
-length = 100
-rect_geom1 = Rectangle.new(original_point, Vector3.new(length,0,0), Vector3.new(0,length,0))
-rect_node1 = Disp3D::NodeRectangle.new(rect_geom1, nil, image1)
-main_view.world_scene_graph.add(rect_node1)
-
-#=========================
-# load image
-file_path2 = File.dirname(__FILE__) + '/data/test2.jpg'
-image2 = Magick::Image.read(file_path2).first
-
-#=========================
-# rect
-original_point = Vector3.new(200,0,0)
-rect_geom2 = Rectangle.new(original_point, Vector3.new(length,0,0), Vector3.new(0,length,0))
-rect_node2 = Disp3D::NodeRectangle.new(rect_geom2, nil, image2)
-main_view.world_scene_graph.add(rect_node2)
-
-#=========================
-# rectplane
-original_point = Vector3.new(-200,0,0)
-rect_geom3 = Rectangle.new(original_point, Vector3.new(length,0,0), Vector3.new(0,length,0))
-rect_node3 = Disp3D::NodeRectangle.new(rect_geom3)
-main_view.world_scene_graph.add(rect_node3)
-
-main_view.fit
-main_view.start