ifmapper 0.5 → 0.6

data/lib/IFMapper/FXRoom.rb

@@ -18,23 +18,26 @@ class FXRoom < Room
     super(x, y, *opts)
   end
 
+  #
+  # Set a new x position for the room.  Value is in grid units.
+  #
   def x=(v)
     @x  = v
     @xx = v * WW + WS_2
   end
 
+  #
+  # Set a new y position for the room.  Value is in grid units.
+  #
   def y=(v)
     @y  = v
     @yy = v * HH + HS_2
   end
 
-  def copy(b)
-    @name     = b.name
-    @objects  = b.objects
-    @tasks    = b.tasks
-    @darkness = b.darkness
-  end
-
+  #
+  # Set selection.  If floating Room Properties window is open, copy
+  # the room data over to it.
+  #
   def selected=(value)
     if value and @@win
       @@win.copy_from(self)
@@ -42,6 +45,9 @@ class FXRoom < Room
     @selected = value
   end
 
+  #
+  # Open a modal requester to change properties
+  #
   def modal_properties(map)
     shown = @@win and @@win.shown?
     if shown
@@ -119,14 +125,33 @@ class FXRoom < Room
     return [x * zoom, y * zoom]
   end
 
+  
+  #
+  # Main draw function for room
+  #
+  def draw(dc, zoom, idx, opt, data)
+    draw_box(dc, zoom, idx, opt)
+    dc.font = data['font']
+    x, y = draw_name(dc, zoom)
+    dc.font = data['objfont']
+    draw_objects(dc, zoom, x, y)
+  end
+
+
+  protected
 
+  #
+  # Draw the room index number
+  #
   def draw_index(dc, zoom, idx)
     x = (@xx + W  - 20 ) * zoom
     y = (@yy + HH - HS - 5 ) * zoom
     dc.drawText(x, y, (idx + 1).to_s)
   end
 
-
+  #
+  # Draw the 'room' and 'index' boxes
+  #
   def draw_box(dc, zoom, idx, opt)
     if @selected
       dc.foreground = 'yellow'
@@ -169,6 +194,9 @@ class FXRoom < Room
     end
   end
 
+  #
+  # Draw text line wrapping after certain length (in chars)
+  #
   def draw_text_wrap(dc, x, y, zoom, maxLen, text)
     if text.size > maxLen
       str = text
@@ -191,12 +219,19 @@ class FXRoom < Room
     return [x, y]
   end
 
+  #
+  # Draw name of room
+  #
   def draw_name(dc, zoom)
     x = (@xx + 5)  * zoom
     y = (@yy + 15) * zoom
     return draw_text_wrap( dc, x, y, zoom, 15, @name )
   end
 
+
+  #
+  # Draw the objects as a comma separated list
+  #
   def draw_objects(dc, zoom, x, y)
     return if @objects == ''
     fh  = dc.font.getFontHeight
@@ -206,13 +241,4 @@ class FXRoom < Room
     return draw_text_wrap( dc, x, y, zoom, 23, objs )
   end
 
-
-  def draw(dc, zoom, idx, opt, data)
-    draw_box(dc, zoom, idx, opt)
-    dc.font = data['font']
-    x, y = draw_name(dc, zoom)
-    dc.font = data['objfont']
-    draw_objects(dc, zoom, x, y)
-  end
-
 end

data/lib/IFMapper/{FXPage.rb → FXSection.rb}

@@ -1,9 +1,9 @@
 
 require 'IFMapper/FXConnection'
 require 'IFMapper/FXRoom'
-require 'IFMapper/Page'
+require 'IFMapper/Section'
 
-class FXPage < Page
+class FXSection < Section
   def new_connection( roomA, exitA, roomB, exitB = nil )
     c = FXConnection.new( roomA, roomB )
     return _new_connection(c, roomA, exitA, roomB, exitB)
@@ -16,7 +16,7 @@ class FXPage < Page
 
   def properties(map)
     if not @win
-      @win = FXPageDialogBox.new(map)
+      @win = FXSectionDialogBox.new(map)
     end
     @win.copy_from(self)
     @win.show

data/lib/IFMapper/{FXPageDialogBox.rb → FXSectionDialogBox.rb}

@@ -1,21 +1,21 @@
 
 
-class FXPageDialogBox < FXDialogBox
+class FXSectionDialogBox < FXDialogBox
 
   def copy_to()
-    @page.name  = @name.text
+    @section.name  = @name.text
     @map.update_title
   end
 
-  def copy_from(page)
-    @name.text   = page.name.to_s
-    @page = page
+  def copy_from(section)
+    @name.text   = section.name.to_s
+    @section = section
   end
 
   def initialize(map)
     decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
 
-    super( map.window, "Page Information", decor, 40, 40, 0, 0 )
+    super( map.window, "Section Information", decor, 40, 40, 0, 0 )
     mainFrame = FXVerticalFrame.new(self,
 				    FRAME_SUNKEN|FRAME_THICK|
 				    LAYOUT_FILL_X|LAYOUT_FILL_Y)

data/lib/IFMapper/FXSpline.rb

@@ -1,23 +1,19 @@
 
 
-class FXPoint
-  def [](idx)
-    return x if idx == 0
-    return y if idx == 1
-  end
-end
 
 class FXSpline
+  OS = 1.0 / 6.0
+  FS = 4.0 / 6.0
   def self.bspline_solve( r, p, num )
-    ax = -1.0/6 * p[0][0] + 0.5 *   p[1][0] - 0.5   * p[2][0] + 1.0/6 * p[3][0]
-    bx =  0.5   * p[0][0] -         p[1][0] + 0.5   * p[2][0]
-    cx = -0.5   * p[0][0]                   + 0.5    * p[2][0]
-    dx =  1.0/6 * p[0][0] + 4.0/6 * p[1][0] + 1.0/6 * p[2][0]
+    ax = -OS  * p[0][0] + 0.5 *   p[1][0] - 0.5 * p[2][0] + OS * p[3][0]
+    bx =  0.5 * p[0][0] -         p[1][0] + 0.5 * p[2][0]
+    cx = -0.5 * p[0][0]                   + 0.5 * p[2][0]
+    dx =  OS  * p[0][0] + FS * p[1][0]    + OS  * p[2][0]
 
-    ay = -1.0/6 * p[0][1] + 0.5 *   p[1][1] - 0.5   * p[2][1] + 1.0/6 * p[3][1]
-    by =  0.5   * p[0][1] -         p[1][1] + 0.5   * p[2][1]
-    cy = -0.5   * p[0][1]                   + 0.5    * p[2][1]
-    dy =  1.0/6 * p[0][1] + 4.0/6 * p[1][1] + 1.0/6 * p[2][1]
+    ay = -OS  * p[0][1] + 0.5 *   p[1][1] - 0.5 * p[2][1] + OS * p[3][1]
+    by =  0.5 * p[0][1] -         p[1][1] + 0.5 * p[2][1]
+    cy = -0.5 * p[0][1]                   + 0.5 * p[2][1]
+    dy =  OS  * p[0][1] + FS * p[1][1] + OS * p[2][1]
 
     t    = 0.0
     tinc = 1.0 / num

data/lib/IFMapper/IFMReader.rb

@@ -53,8 +53,13 @@ class IFMReader
     # We start map at 1, 1
     @x, @y = [0, 0]
     @room  = @item = @task  = nil
-    @map.page = 0
-    @last_page = 0
+    @map.section = 0
+
+    if @map.kind_of?(FXMap)
+      @map.window.hide
+    end
+
+    @last_section = 0
     @ignore_first_section = true
     @room_idx = 0
     line_number = 0
@@ -226,18 +231,18 @@ class IFMReader
 	# current position.
 	@room = nil
 	@x = @y = 1
-	# dont' add a page for first 'map' keyword
+	# dont' add a section for first 'map' keyword
 	if @ignore_first_section
 	  @ignore_first_section = false
-	  @map.pages[0].name = section
+	  @map.sections[0].name = section
 	  next
 	end
 	if @resolve_tags
-	  @map.page  = @last_page + 1
-	  @last_page = @map.page
+	  @map.section  = @last_section + 1
+	  @last_section = @map.section
 	else
-	  @map.new_page
-	  @map.pages[-1].name = section
+	  @map.new_section
+	  @map.sections[-1].name = section
 	end
       when 'title'
 	@map.name = get_string
@@ -404,11 +409,11 @@ class IFMReader
       # If from keyword present, move from that room on.
       if from
 	roomA = from
-	# 'from' can also connect stuff not in current page... 
-	# so we check we are in the right page.
-	@map.pages.each_with_index { |p, idx|
+	# 'from' can also connect stuff not in current section... 
+	# so we check we are in the right section.
+	@map.sections.each_with_index { |p, idx|
 	  if p.rooms.include?(roomA)
-	    @map.page = idx
+	    @map.section = idx
 	    break
 	  end
 	}
@@ -433,10 +438,10 @@ class IFMReader
 	@room_idx += 1
       else
 	# Verify there's no room in that location yet
-	page = @map.pages[@map.page]
-	page.rooms.each { |r|
+	section = @map.sections[@map.section]
+	section.rooms.each { |r|
 	  if r.x == @x and r.y == @y
-	    err  = "Page #{@map.page+1} already has location #{r} at #{@x}, #{@y}.\n"
+	    err  = "Section #{@map.section+1} already has location #{r} at #{@x}, #{@y}.\n"
 	    err << "Cannot create '#{roomname}'"
 	    raise MapError, err
 	  end
@@ -475,15 +480,15 @@ class IFMReader
       end
 
       # 'from' and 'link' keywords can also connect stuff not in
-      # current page... so we check for that here
-      @map.pages.each_with_index { |p, idx|
+      # current section... so we check for that here
+      @map.sections.each_with_index { |p, idx|
 	if p.rooms.include?(roomA)
-	  @map.page = idx
+	  @map.section = idx
 	  break
 	end
       }
-      if not @map.pages[@map.page].rooms.include?(roomB)
-	raise MapError, "Linking #{roomA} and #{roomB} which are in different pages"
+      if not @map.sections[@map.section].rooms.include?(roomB)
+	raise MapError, "Linking #{roomA} and #{roomB} which are in different sections"
       end
 
       begin
@@ -531,7 +536,7 @@ class IFMReader
   end
 
   #
-  # Okay, check all min/max locations in all pages
+  # Okay, check all min/max locations in all sections
   # and then do the following:
   #   a) Adjust map's width/height
   #   b) Shift all rooms so that no rooms are in negative locations
@@ -541,10 +546,10 @@ class IFMReader
     @map.width = @map.height = 1
     minXY = []
     maxXY = []
-    @map.pages.each { |page|
-      next if page.rooms.empty?
+    @map.sections.each { |section|
+      next if section.rooms.empty?
 
-      sizes = page.min_max_rooms
+      sizes = section.min_max_rooms
       minXY.push sizes[0]
       maxXY.push sizes[1]
 
@@ -558,10 +563,10 @@ class IFMReader
 
 
     # Okay, minXY[]/maxXY[] contains all the minXY/maxXY positions of
-    # each page.  With that info and @map.weight/height, we can
-    # start shifting all nodes in the page so that they will fit.
+    # each section.  With that info and @map.weight/height, we can
+    # start shifting all nodes in the section so that they will fit.
     idx = 0
-    @map.pages.each  { |p|
+    @map.sections.each  { |p|
       next if p.rooms.size == 0
       x = y = 0
       x = 1 - minXY[idx][0] if minXY[idx][0] < 1
@@ -579,7 +584,7 @@ class IFMReader
     @map.create_pathmap if @map.kind_of?(FXMap)
   end
 
-  def initialize(file, map = Map.new('IMF Imported Map'))
+  def initialize(file, map = Map.new('IFM Imported Map'))
     @tags   = {}
     @map    = map
     @rooms  = []
@@ -594,10 +599,13 @@ class IFMReader
       parse(f)
     }
     # puts '--------------- second pass done'
-    @map.page       = 0
-    @map.filename   = file.sub(/\.ifm$/i, '.map')
-    @map.navigation = true
+    @map.section    = 0
     adjust_map
+    if @map.kind_of?(FXMap)
+      @map.filename   = file.sub(/\.ifm$/i, '.map')
+      @map.navigation = true
+      @map.window.show
+    end
     @tags = {}   # save some memory by clearing the tag list
     @rooms = nil # and room list
   end

data/lib/IFMapper/Map.rb

@@ -1,108 +1,107 @@
 #!/usr/bin/env ruby
 
 require 'IFMapper/Room'
-require 'IFMapper/Page'
+require 'IFMapper/Section'
 
 class Map
   attr_accessor :name
   attr_accessor :creator
   attr_accessor :date
 
-  attr_reader   :page
-  attr_accessor :pages
+  attr_reader   :section
+  attr_accessor :sections
 
   attr_accessor :width
   attr_accessor :height
 
-  def page=(x)
+  def section=(x)
     x = 0               if x < 0 
-    x = @pages.size - 1 if x >= @pages.size
-    @page = x
+    x = @sections.size - 1 if x >= @sections.size
+    @section = x
   end
 
   #
   # Used for loading class with Marshal
   #
   def marshal_load(v)
-    @name = v.shift
-    @creator = v.shift
-    @date = v.shift
-    @page = v.shift
-    @pages = v.shift
-    @width = v.shift
-    @height = v.shift
+    @name     = v.shift
+    @creator  = v.shift
+    @date     = v.shift
+    @section  = v.shift
+    @sections = v.shift
+    @width    = v.shift
+    @height   = v.shift
   end
 
   #
   # Used for saving class with Marshal
   #
   def marshal_dump
-    [ @name, @creator, @date, @page, @pages, @width, @height ] 
+    [ @name, @creator, @date, @section, @sections, @width, @height ] 
   end
 
   def initialize(name)
-    @page    = 0
+    @section = 0
     @name    = name
     @creator = ''
 
-    # if printing sideways
-    @width  = 20
-    @height = 20
+    @width  = 8
+    @height = 11
 
-    # Add at least one page
-    @pages = []
-    new_page
+    # Add at least one section
+    @sections = []
+    new_section
   end
 
   def copy(b)
-    @page    = b.page
-    @pages   = b.pages
-    @name    = b.name
-    @creator = b.creator
-    @width   = b.width
-    @height  = b.height
-    @date    = b.date
+    @section  = b.section
+    @sections = b.sections
+    @name     = b.name
+    @creator  = b.creator
+    @width    = b.width
+    @height   = b.height
+    @date     = b.date
   end
 
   def delete_connection(c)
-    @pages[@page].delete_connection(c)
+    @sections[@section].delete_connection(c)
   end
 
   def delete_connection_at( idx )
-    @pages[@page].delete_connection_at(idx)
+    @sections[@section].delete_connection_at(idx)
   end
 
 
   def new_connection( roomA, exitA, roomB, exitB = nil )
-    @pages[@page].new_connection(roomA, exitA, roomB, exitB)
+    @sections[@section].new_connection(roomA, exitA, roomB, exitB)
   end
 
 
   def delete_room_at(idx)
-    @pages[@page].delete_room_at(idx)
+    @sections[@section].delete_room_at(idx)
   end
 
   def delete_room(r)
-    @pages[@page].delete_room(r)
+    @sections[@section].delete_room(r)
   end
 
   def new_room( x, y )
-    @pages[@page].new_room(x, y)
+    @sections[@section].new_room(x, y)
   end
 
-  def new_page
-    @pages.push( Page.new )
-    @page = @pages.size - 1
+  def new_section
+    @sections.push( Section.new )
+    @section = @sections.size - 1
   end
 
-  def _check_page
-    @page = @pages.size - 1 if @page >= @pages.size
-    new_page if @pages.size == 0
+  def _check_section
+    @section = @sections.size - 1 if @section >= @sections.size
+    new_section if @sections.size == 0
   end
 
-  def delete_page_at(idx)
-    @pages.delete_at(idx)
-    _check_page
+  def delete_section_at(idx)
+    @sections.delete_at(idx)
+    _check_section
   end
 
 end