disp3D 0.2.1 → 1.0.1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4" 
-  gem "gmath3D", "~> 0.2.5"
+  gem "gmath3D", "~> 1.0.0"
   gem "ruby-opengl", "0.60.1"
   gem "rmagick"
 end

data/README.md

@@ -0,0 +1,56 @@
+disp3D
+=======
+
+disp3D is a library for 3D application without call opengl function. Writing OpenGL function is time-cosuming and boring. You can display 3D objects very easily as you want with this library. 
+
+INSTALLING
+============
+
+This library depends on these Gems.
+
+- gmath3D
+- ruby-opengl
+- rmagick
+- qtbindings(optional)
+
+To install it, just type...
+
+    $ gem install disp3D
+
+RUNNING
+============
+
+Require 'disp3d', then you can use most of the classes in the lib (except for qt-components).
+
+This is the first code you type.
+
+    require 'disp3D'
+
+    # create view with GLUTWindow, then set width, height and window title
+    main_view = Disp3D::GLUTWindow.new(400,400, "01_HelloWorld")
+
+    # open world scene graph view has
+    main_view.world_scene_graph.open do
+      # put TeaPod which color is Red and size is 10 
+      add_new :type => :TeaPod,
+              :material_color => [1,0,0,1],
+              :size => 10.0
+    end
+
+    # set parameter for camera
+    main_view.camera.projection = Disp3D::Camera::ORTHOGONAL
+
+    # finally show window!
+    main_view.start
+
+You can see a teapod is shown in the window. you can rotate it with mouse L button and drag.
+![image](https://github.com/toshi0328/wiki/blob/master/images/disp3D/HelloWorld01.png?raw=true)
+
+see example/tutorial/*.rb for more details.
+
+Copyright
+============
+
+Copyright (c) 2011 Toshiyasu Shimizu. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-0.2.1
+1.0.1

data/disp3D.gemspec

@@ -4,23 +4,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{disp3D}
-  s.version = "0.2.1"
+  s.name = "disp3D"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toshiyasu Shimizu"]
-  s.date = %q{2011-12-01}
-  s.description = %q{disp3D provide 3D GUI framework}
-  s.email = %q{toshi0328@gmail.com}
+  s.date = "2011-12-12"
+  s.description = "disp3D provide 3D GUI framework"
+  s.email = "toshi0328@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "disp3D.gemspec",
@@ -29,11 +29,6 @@ Gem::Specification.new do |s|
     "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",
@@ -42,7 +37,16 @@ Gem::Specification.new do |s|
     "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",
@@ -55,12 +59,14 @@ Gem::Specification.new do |s|
     "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",
@@ -71,8 +77,6 @@ Gem::Specification.new do |s|
     "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",
@@ -96,11 +100,11 @@ Gem::Specification.new do |s|
     "test/test_scene_graph.rb",
     "test/test_stl.rb"
   ]
-  s.homepage = %q{http://github.com/toshi0328/disp3D}
+  s.homepage = "http://github.com/toshi0328/disp3D"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{disp3D provide 3D GUI framework.}
+  s.rubygems_version = "1.8.12"
+  s.summary = "disp3D provide 3D GUI framework."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -108,20 +112,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<gmath3D>, ["~> 0.2.5"])
+      s.add_development_dependency(%q<gmath3D>, ["~> 1.0.0"])
       s.add_development_dependency(%q<ruby-opengl>, ["= 0.60.1"])
       s.add_development_dependency(%q<rmagick>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<gmath3D>, ["~> 0.2.5"])
+      s.add_dependency(%q<gmath3D>, ["~> 1.0.0"])
       s.add_dependency(%q<ruby-opengl>, ["= 0.60.1"])
       s.add_dependency(%q<rmagick>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<gmath3D>, ["~> 0.2.5"])
+    s.add_dependency(%q<gmath3D>, ["~> 1.0.0"])
     s.add_dependency(%q<ruby-opengl>, ["= 0.60.1"])
     s.add_dependency(%q<rmagick>, [">= 0"])
   end

data/example/stl_viewer/document_ctrl.rb

@@ -27,8 +27,8 @@ class DocumentCtrl
 
 # 更新といっても、ノードの入れ替え、色の変更、フィットさせるだけなど、様々と思うが・・・
   def update
-    @main_window.gl_widget.gl_view.world_scene_graph.add(@document.tri_node)
-    @main_window.gl_widget.gl_view.fit
+    @main_window.gl_widget.world_scene_graph.add(@document.tri_node)
+    @main_window.gl_widget.fit
     @main_window.gl_widget.updateGL
 
     @main_window.ctrl_widget.vert_cnt = @document.tri_mesh.vertices.size

data/example/stl_viewer/qt_widget_controller.rb

@@ -73,21 +73,17 @@ class QTWidgetController < Qt::Widget
   end
 
   def fit
-    @gl_widget.gl_view.fit
+    @gl_widget.fit
     @gl_widget.updateGL
   end
 
   def centering
-    @gl_widget.gl_view.centering
+    @gl_widgetcentering
     @gl_widget.updateGL
   end
 
   def change_projection
-    if(@gl_widget.gl_view.camera.is_orth)
-      @gl_widget.gl_view.camera.is_orth = false
-    else
-      @gl_widget.gl_view.camera.is_orth = true
-    end
+    @gl_widget.camera.switch_projection
     @gl_widget.updateGL
   end
 

data/example/tutorial/03_CameraScene.rb

@@ -2,10 +2,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 
 require 'disp3D'
 
-main_view = Disp3D::GLUTWindow.new(600,400,"03_CameraScene")
+main_view = Disp3D::GLUTWindow.new(350,300,"03_CameraScene")
 
 box1 = TriMesh.from_box(Box.new(Vector3.new(-1,-1,-1),Vector3.new(1,1,1)))
-box2 = TriMesh.from_box(Box.new(Vector3.new(-200,-100,0),Vector3.new(-150,-50,0.5)))
 
 main_view.world_scene_graph.open do
   add_new :type => :Tris,
@@ -15,9 +14,10 @@ main_view.world_scene_graph.open do
 end
 
 main_view.camera_scene_graph.open do
-  add_new :type => :Tris,
-          :geom => box2,
-          :colors => [0,1,0,1]
+  add_new :type => :Text,
+          :geom => Vector3.new(-125,100),
+          :colors => [0,1,0,1],
+          :text => "This text is in the camera scene"
 end
 
 main_view.start

data/example/tutorial/04_Qt.rb

@@ -6,7 +6,7 @@ require 'qt_widget_gl'
 class TestQTGLWindow < Qt::Widget
   def initialize(parent = nil)
     super
-    @gl_widget = QtWidgetGL.new(self, 600, 400)
+    @gl_widget = QtWidgetGL.new(self, 300, 300)
     self.layout = Qt::HBoxLayout.new do |m|
       m.addWidget(@gl_widget)
     end
@@ -16,13 +16,13 @@ class TestQTGLWindow < Qt::Widget
 
   def showEvent(eventArg)
     if( @is_first_show )
-      @gl_widget.gl_view.world_scene_graph.open do
+      @gl_widget.world_scene_graph.open do
         add_new :type => :TeaPod,
                 :material_color => [1,1,0,1],
                 :size => 10.0
       end
-      @gl_widget.gl_view.camera.projection = Disp3D::Camera::ORTHOGONAL
-      @gl_widget.gl_view.fit
+      @gl_widget.camera.projection = Disp3D::Camera::ORTHOGONAL
+      @gl_widget.fit
       @is_first_show = false
     end
   end

data/example/tutorial/05_Pick.rb

@@ -5,16 +5,14 @@ require 'disp3D'
 main_view = Disp3D::GLUTWindow.new(600,400)
 
 rect_geom = Rectangle.new(Vector3.new(-1,-1,2), Vector3.new(2,0,0), Vector3.new(0,2,0))
-rect_tri_mesh_geom = TriMesh.from_rectangle(rect_geom)
-
 box_geom = Box.new(Vector3.new(),Vector3.new(1,1,1))
 box_tri_mesh_geom = TriMesh.from_box(box_geom)
 
 main_view.world_scene_graph.open do
   # plane
-  add_new :type => :Tris,
-          :geom => rect_tri_mesh_geom,
-          :name => :plane0
+  add_new :type => :Rectangle,
+          :geom => rect_geom,
+          :name => :rectangle0
 
   # text
   rect_geom.vertices.each do | vertex |
@@ -30,34 +28,31 @@ main_view.world_scene_graph.open do
           :normal_mode => Disp3D::NodeTris::NORMAL_EACH_FACE,
           :material_color => [1,0,0,1],
           :post_translate => Vector3.new(-2,-2,0),
-          :name => :cube1
+          :name => :cube0
 
   add_new :type => :Tris,
           :geom => box_tri_mesh_geom,
           :normal_mode => Disp3D::NodeTris::NORMAL_EACH_FACE,
           :material_color => [0,1,0,1],
           :post_translate => Vector3.new(1,-2,0),
-          :name => :cube2
+          :name => :cube1
 
   add_new :type => :Tris,
           :geom => box_tri_mesh_geom,
           :normal_mode => Disp3D::NodeTris::NORMAL_EACH_FACE,
           :material_color => [0,0,1,1],
           :post_translate => Vector3.new(1,1,0),
-          :name => :cube3
+          :name => :cube2
 
   add_new :type => :Tris,
           :geom => box_tri_mesh_geom,
           :normal_mode => Disp3D::NodeTris::NORMAL_EACH_FACE,
           :material_color => [0,0,0,1],
           :post_translate => Vector3.new(-2,1,0),
-          :name => :cube4
+          :name => :cube3
 end
 
-main_view.mouse_press do |view, button, x, y|
-  next if( button != GLUT::LEFT_BUTTON )
-  # result is Array of PickedResult
-  results = view.picker.pick(x,y)
+main_view.picker.post_picked do |results|
   if(results != nil)
     puts "hit #{results.size} elements"
     results.each_with_index do | result, idx |
@@ -72,4 +67,9 @@ main_view.mouse_press do |view, button, x, y|
   end
 end
 
+main_view.mouse_press do |view, button, x, y|
+  next if( button != GLUT::LEFT_BUTTON )
+  view.picker.start_point_pick
+end
+
 main_view.start

data/example/tutorial/06_FileParser.rb

@@ -2,13 +2,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 
 require 'disp3D'
 
-file_path = File.dirname(__FILE__) + "./data/bunny.stl";
+file_path = File.dirname(__FILE__) + "/data/bunny.stl";
 if( !File.exists?(file_path) )
   puts file_path + " is not exist!"
   exit
 end
 
-main_view = Disp3D::GLUTWindow.new(600,400)
+main_view = Disp3D::GLUTWindow.new(600,400,"06_FileParser")
 
 stl = Disp3D::STL.new()
 stl.parse(file_path, Disp3D::STL::ASCII)
@@ -17,5 +17,5 @@ main_view.world_scene_graph.open do
   add_new :type => :Tris,
           :geom => stl
 end
-
+main_view.camera.projection = Disp3D::Camera::ORTHOGONAL
 main_view.start

data/example/tutorial/07_SceneGraph.rb

@@ -32,11 +32,9 @@ main_view.world_scene_graph.open do
   end
 end
 
-main_view.mouse_press do |view, button, x, y|
-  next if( button != GLUT::LEFT_BUTTON )
-  # result is Array of PickedResult
-  results = view.picker.pick(x,y)
+main_view.picker.post_picked do |results|
   if(results != nil)
+    picked_node_name = nil
     puts "hit #{results.size} elements"
     results.each_with_index do | result, idx |
       puts "====element #{idx}===="
@@ -44,8 +42,22 @@ main_view.mouse_press do |view, button, x, y|
       puts "instance id : #{result.node_path_info[0].node.instance_id}"
       puts "path id : #{result.node_path_info[0].path_id}"
       puts "=================="
+      picked_node_name = result.node_path_info[0].node.name
+    end
+    if(!picked_node_name.nil?)
+      main_view.world_scene_graph.open do
+        update :name => picked_node_name,
+               :material_color => [0,1,0,1]
+      end
+      main_view.update
     end
   end
 end
 
+
+main_view.mouse_press do |view, button, x, y|
+  next if( button != GLUT::LEFT_BUTTON )
+  view.picker.start_point_pick
+end
+
 main_view.start

data/example/tutorial/08_SceneGraph2.rb

@@ -33,26 +33,27 @@ main_view.world_scene_graph.open do
 end
 
 main_view.mouse_press do |view, button, x, y|
-  results = view.picker.pick(x,y)
-  if(results != nil)
-    # remove node path when left button pressed
-    if( button == GLUT::LEFT_BUTTON )
-      path_id_ary = results.collect {| result | result.node_path_info[0].path_id }
-      main_view.world_scene_graph.open do
-        path_id_ary.each do |path_id|
-          remove path_id
+  # remove node path when left button pressed
+  if( button == GLUT::LEFT_BUTTON )
+    view.picker.start_point_pick do |results|
+      if(results != nil)
+        path_id_ary = results.collect {| result | result.node_path_info[0].path_id }
+        main_view.world_scene_graph.open do
+          path_id_ary.each do |path_id|
+            remove path_id
+          end
         end
+        main_view.update
       end
-      main_view.update
     end
+  end
 
-    # delete node when right button pressed
-    if( button == GLUT::RIGHT_BUTTON )
-      main_view.world_scene_graph.open do
-        delete :cube0
-      end
-      main_view.update
+  # delete node when right button pressed
+  if( button == GLUT::RIGHT_BUTTON )
+    main_view.world_scene_graph.open do
+      delete :cube0
     end
+    main_view.update
   end
 end