physicist 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd83597bea0363b5b29832d055ca424a40739170
-  data.tar.gz: 9d82f12a68cc2bc631a2fc336918643d7041c2e9
+  metadata.gz: a8e6b5748e0166acbf9e69a28946931999a82817
+  data.tar.gz: f1abc35f92cf0157ffcd366602d0b5d722438930
 SHA512:
-  metadata.gz: f8e64f7f5f427b8d12e21675659389bf6cae97806d705ad7cd2d7c251360e0bdae8dd922b210b40344b771c9c1b5df3597f7d19af282afe5705c9ecf5978ad37
-  data.tar.gz: 79b9502573ac874cece9b0ac486ea4e2a617ebe6fc58b01ecd0915d21903feb30d225759199a2fd1b9729603476de9086e9a26e64ae8c1117471df289263fba1
+  metadata.gz: 6aab3cf912156901fa5051c0b2259feedc77bb960bedc59c049fadc4744e799d6d2c2e6ce7bc6222d0be2e80b6368eead4d9c8bf34d471d3c4c2710d90576f7e
+  data.tar.gz: 74b51b92552615d50c7d7ab5f9f44ee43f3139a9fe897ca92913562285efb2976d68a2be5b07c65551d6cbf5dab9d7bb10d080be7054a229bc870efebdcb0c73

data/Gemfile

@@ -2,7 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
+
 group :development do
   gem 'kramdown'
   gem 'pry'
+
+  # really for laboratory app only...
+  gem 'dedalus' #, path: '../dedalus'
+  gem 'gosu'
+  gem 'joyce' #, path: '../joyce'
 end

data/bin/physicist

@@ -5,10 +5,13 @@ if File.directory?(File.join(root,'.git'))
   Dir.chdir(root) do
     begin
       require 'bundler/setup'
+      require 'physicist'
+      require 'physicist/laboratory/app'
+      Physicist::Laboratory::App.kickstart!
     rescue LoadError => e
       warn e.message
       warn "Run `gem install bundler` to install Bundler"
-      exit -1
+      exit(-1)
     end
   end
 end

data/lib/physicist/body.rb

@@ -0,0 +1,222 @@
+module Physicist
+  class Body
+    attr_reader :position, :velocity, :t0, :dimensions
+
+    def initialize(position:, velocity:, t0:, dimensions:)
+      @position = position
+      @velocity = velocity
+      @dimensions = dimensions
+      @t0 = t0
+    end
+
+    def width
+      dimensions[0]
+    end
+
+    def height
+      dimensions[1]
+    end
+
+    def gravity
+      50.0
+    end
+
+    def friction
+      10.0
+    end
+
+    def at(t, obstacles:[])
+      # p [ :body, at: t, pos: position, vel: velocity ]
+      x0, _   = *position
+      vx0,vy0 = *velocity
+
+      x_speed  = vx0.abs
+      sign_x = vx0 > 0.0 ? 1.0 : (vx0 < -0.0 ? -1.0 : 0.0)
+
+      dt = t - t0
+
+      vy = vy0 + (gravity * dt)
+
+      fric = friction * dt
+      x_halted = false
+
+      vx = if (3*fric) < x_speed
+             vx0 + (fric * -sign_x)
+           else
+             x_halted = true
+             x_stopping_distance = (vx0 ** 2) / (3 * friction)
+             0
+           end
+
+      xt,yt,vxt,vyt = deduce_y_coordinate(vy,t,obstacles:obstacles) do |y,_vyt|
+        if x_halted
+          [x0 + (x_stopping_distance * sign_x), y, vx, _vyt]
+        else
+          deduce_x_coordinate(y,vx,t,obstacles:obstacles) do |x,_vxt|
+            [x, y, _vxt, _vyt]
+          end
+        end
+      end
+
+      vxt = 0 if -0.05 < vx && vx < 0.05
+      vyt = 0 if -0.05 < vy && vy < 0.05
+
+      Body.new(
+        position: [xt,yt],
+        velocity: [vxt,vyt],
+        dimensions: dimensions,
+        t0: t
+      )
+    end
+
+    private
+    def deduce_x_coordinate(y,vx,t,obstacles:,&blk)
+      x0,_ = *position
+      dt = t - t0
+
+      next_x_obstacle = next_obstacle_on_x_axis(y,vx,t,obstacles:obstacles)
+      if next_x_obstacle
+        ox,_ = *next_x_obstacle.position
+        ow,_ = *next_x_obstacle.dimensions
+
+        distance_to_next_x_obstacle =
+          if vx > 0
+            ((x0+width) - ox).abs
+          elsif vx < 0
+            ((x0) - (ox+ow)).abs
+          end
+
+        distance_travelled_in_x_axis_if_no_obstacles = vx * dt
+        p [ :next_x_obs, at: ox, distance: distance_to_next_x_obstacle, distance_without_obs: distance_travelled_in_x_axis_if_no_obstacles ]
+        # require 'pry'
+        # binding.pry
+
+        if distance_travelled_in_x_axis_if_no_obstacles.abs < distance_to_next_x_obstacle
+          p [ :travel_x_less_than_obs_x ]
+          yield [x0 + (vx*dt), vx]
+        else
+          p [ :travel_x_more_than_obs_x ]
+          if vx > 0
+            yield [next_x_obstacle.position[0]-width, 0]
+          else
+            yield [next_x_obstacle.position[0]+next_x_obstacle.dimensions[0], 0]
+          end
+        end
+      else
+        yield [x0 + (vx*dt), vx]
+      end
+    end
+
+    def deduce_y_coordinate(vy,t,obstacles:,&blk)
+      _,y0   = *position
+      dt = t - t0
+
+      next_y_obstacle = next_obstacle_on_y_axis(vy,t,obstacles:obstacles)
+
+      if next_y_obstacle
+        distance_to_next_y_obstacle =
+          if vy > 0
+            ((y0+height) - next_y_obstacle.position[1]).abs
+          else
+            (y0 - (next_y_obstacle.position[1] + next_y_obstacle.dimensions[1])).abs
+          end
+        distance_travelled_in_y_axis_if_no_obstacles = (vy * dt)
+
+        if distance_travelled_in_y_axis_if_no_obstacles.abs < distance_to_next_y_obstacle
+          yield [y0 + (vy * dt), vy ]
+        else
+          if vy > 0
+            yield [next_y_obstacle.position[1] - 1.01, 0] # (height + 0.1), 0]
+          else
+            yield [next_y_obstacle.position[1] + next_y_obstacle.dimensions[1] + 0.1, 0]
+          end
+        end
+      else
+        yield [y0 + (vy * dt), vy]
+      end
+    end
+
+    def next_obstacle_on_x_axis(y,vx,t,obstacles:)
+      x0,_ = *position
+
+      obstacles_along_axis = obstacles.select do |obstacle|
+        _,oy = *obstacle.position
+        _,oh = *obstacle.dimensions
+
+        oy <= y + height && y <= oy + oh
+      end
+
+      obstacles_in_direction_of_movement =
+        if vx > 0
+          obstacles_along_axis.select do |obstacle|
+            ox,_ = *obstacle.position
+            # ow,oh = *obstacle.dimensions
+
+            ox >= x0 + width
+          end
+        elsif vx < 0
+          # require 'pry'
+          # binding.pry
+          obstacles_along_axis.select do |obstacle|
+            ox,_ = *obstacle.position
+            ow,_ = *obstacle.dimensions
+            x0 >= ox + ow
+            # ox + ow >= x0
+          end
+        else
+          []
+        end
+
+      if obstacles_in_direction_of_movement.any?
+        obstacles_in_direction_of_movement.min_by do |obstacle|
+          ox,_ = *obstacle.position
+          (x0 - ox).abs
+        end
+      else
+        nil
+      end
+    end
+
+    def next_obstacle_on_y_axis(vy,t,obstacles:)
+      x0,y0 = *position
+
+      # x0 += width/4
+      w = width #/2
+
+      obstacles_along_axis = obstacles.select do |obstacle|
+        ox,_ = *obstacle.position
+        ow,_ = *obstacle.dimensions
+        ox <= x0 + w && x0 <= ox + ow
+      end
+
+      obstacles_in_direction_of_movement =
+        if vy > 0
+          obstacles_along_axis.select do |obstacle|
+            _,oy = *obstacle.position
+
+            oy >= y0 + height
+          end
+        elsif vy < 0
+          obstacles_along_axis.select do |obstacle|
+            _,oy = *obstacle.position
+            _,oh = *obstacle.dimensions
+
+            oy + oh <= y0
+          end
+        else
+          []
+        end
+
+      if obstacles_in_direction_of_movement
+        obstacles_in_direction_of_movement.min_by do |obstacle|
+          _,oy = *obstacle.position
+
+          # distance to me
+          (y0 - oy).abs
+        end
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/app.rb

@@ -0,0 +1,104 @@
+require_relative 'screen'
+require_relative 'view'
+
+require_relative 'commands/create_scientist'
+require_relative 'commands/move_scientist'
+require_relative 'commands/jump_scientist'
+
+require_relative 'handlers/create_scientist_handler'
+require_relative 'handlers/move_scientist_handler'
+require_relative 'handlers/jump_scientist_handler'
+
+require_relative 'events/scientist_created_event'
+require_relative 'events/scientist_updated_event'
+require_relative 'events/space_created_event'
+
+require_relative 'listeners/scientist_created_event_listener'
+require_relative 'listeners/scientist_updated_event_listener'
+require_relative 'listeners/space_created_event_listener'
+
+require_relative 'models/scientist'
+require_relative 'models/space'
+
+require_relative 'views/scientist_view'
+require_relative 'views/workspace_view'
+
+module Physicist
+  module Laboratory
+    class App < Joyce::Application
+      viewed_with Physicist::Laboratory::View
+
+      attr_accessor :scientist
+
+      def setup(*)
+        p [ :lab_setup! ]
+        fire(
+          create_scientist(
+            scientist_id: scientist_id,
+            name: "Bill Bye",
+            title: "Science Guy",
+            position: [0,2],
+            velocity: [0,0]
+          )
+        )
+      end
+
+      def tick
+        Scientist.all.each(&:tick)
+
+
+        # poll for movement keys...
+        if window.button_down?(Gosu::KbLeft)
+          fire(move_scientist(:left))
+        elsif window.button_down?(Gosu::KbRight)
+          fire(move_scientist(:right))
+        end
+
+        # TODO
+        p [ :check_jump ]
+        if window.button_down?(Gosu::KbUp)
+          p [ :jump! ]
+          fire(jump)
+        else
+          p [ :no_jump! ]
+        end
+      end
+
+      def press(key)
+        if key == Gosu::KbLeft
+          fire(move_scientist(:left))
+        elsif key == Gosu::KbRight
+          fire(move_scientist(:right))
+        end
+
+        if key == Gosu::KbUp
+          fire(jump)
+        end
+      end
+
+      def scientist_view
+        ScientistView.where(scientist_id: scientist_id).first || NullScientistView.new
+      end
+
+      def workspace_view
+        WorkspaceView.where(space_id: scientist_view.space_id).first || NullWorkspaceView.new
+      end
+
+      def create_scientist(*args)
+        CreateScientist.create(*args)
+      end
+
+      def move_scientist(direction)
+        MoveScientist.create(scientist_id: scientist_id, direction: direction)
+      end
+
+      def jump
+        JumpScientist.create(scientist_id: scientist_id)
+      end
+
+      def scientist_id
+        @scientist_id ||= SecureRandom.uuid
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/commands/create_scientist.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class CreateScientist < Metacosm::Command
+      attr_accessor :scientist_id, :name, :title, :position, :velocity
+    end
+  end
+end

data/lib/physicist/laboratory/commands/jump_scientist.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class JumpScientist < Metacosm::Command
+      attr_accessor :scientist_id
+    end
+  end
+end

data/lib/physicist/laboratory/commands/move_scientist.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class MoveScientist < Metacosm::Command
+      attr_accessor :scientist_id, :direction
+    end
+  end
+end

data/lib/physicist/laboratory/events/scientist_created_event.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class ScientistCreatedEvent < Metacosm::Event
+      attr_accessor :scientist_id, :space_id, :name, :title, :position, :velocity
+    end
+  end
+end

data/lib/physicist/laboratory/events/scientist_updated_event.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class ScientistUpdatedEvent < Metacosm::Event
+      attr_accessor :scientist_id, :position, :velocity, :updated_at
+    end
+  end
+end

data/lib/physicist/laboratory/events/space_created_event.rb

@@ -0,0 +1,7 @@
+module Physicist
+  module Laboratory
+    class SpaceCreatedEvent < Metacosm::Event
+      attr_accessor :space_id, :grid_map
+    end
+  end
+end

data/lib/physicist/laboratory/handlers/create_scientist_handler.rb

@@ -0,0 +1,34 @@
+module Physicist
+  module Laboratory
+    class CreateScientistHandler
+      def handle(scientist_id:, name:, title:, position:, velocity:)
+        p [ :creating_space ]
+
+        map_data = (
+          [
+            [ 1, 1,   1,   1,   1,   1,   1,   1,   1,   1,   1 ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ],
+            [ 1, nil, nil, nil, nil, 2, nil, nil, nil, nil, 1 ],
+            [ 1, 1,   1,   1,   1,   1,   1,   1,   1,   1,   1 ]
+          ]
+        )
+
+        space = Space.create(grid_map: map_data)
+
+        p [ :creating_scientist, name: name ]
+        space.create_scientist(
+          id: scientist_id,
+          name: name,
+          title: title,
+          position: position,
+          velocity: velocity
+        )
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/handlers/jump_scientist_handler.rb

@@ -0,0 +1,10 @@
+module Physicist
+  module Laboratory
+    class JumpScientistHandler
+      def handle(scientist_id:)
+        scientist = Scientist.find(scientist_id)
+        scientist.jump
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/handlers/move_scientist_handler.rb

@@ -0,0 +1,10 @@
+module Physicist
+  module Laboratory
+    class MoveScientistHandler
+      def handle(scientist_id:, direction:)
+        scientist = Scientist.find(scientist_id)
+        scientist.move(direction: direction)
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/listeners/scientist_created_event_listener.rb

@@ -0,0 +1,15 @@
+module Physicist
+  module Laboratory
+    class ScientistCreatedEventListener < Metacosm::EventListener
+      def receive(scientist_id:, space_id:, name:, title:, position:, velocity:)
+        ScientistView.create(
+          scientist_id: scientist_id,
+          space_id: space_id,
+          display_name: "#{name} the #{title}",
+          position: position,
+          velocity: velocity
+        )
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/listeners/scientist_updated_event_listener.rb

@@ -0,0 +1,15 @@
+module Physicist
+  module Laboratory
+    class ScientistUpdatedEventListener < Metacosm::EventListener
+      def receive(scientist_id:, position:, velocity:, updated_at:)
+        p [ :scientist_updated, pos: position, vel: velocity ]
+        scientist_view = ScientistView.find_by(scientist_id: scientist_id)
+        scientist_view.update(
+          position: position,
+          velocity: velocity,
+          t0: updated_at
+        )
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/listeners/space_created_event_listener.rb

@@ -0,0 +1,9 @@
+module Physicist
+  module Laboratory
+    class SpaceCreatedEventListener < Metacosm::EventListener
+      def receive(space_id:, grid_map:)
+        WorkspaceView.create(space_id: space_id, grid_map: grid_map)
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/models/scientist.rb

@@ -0,0 +1,84 @@
+module Physicist
+  module Laboratory
+    # user avatars are 'scientists'
+    class Scientist < Metacosm::Model
+      belongs_to :space
+
+      # attr_accessor :space_id #??
+      attr_accessor :name, :title
+      attr_accessor :position, :velocity
+      attr_accessor :updated_at
+
+      def tick
+        update(
+          position: current.position, 
+          velocity: current.velocity, 
+          updated_at: Time.now
+        )
+      end
+
+      def ground_speed
+        5
+      end
+
+      def max_ground_speed
+        10
+      end
+
+      def leg_strength # ??
+        -12
+      end
+
+      def max_jump_velocity
+        -30
+      end
+
+      def move(direction:)
+        vx,vy = *current.velocity
+        speed = ground_speed
+        dvx = direction == :left ? -speed : speed
+        vxt = vx + dvx
+        return unless vxt.abs < max_ground_speed
+        p [ :move, dir: direction, current: current, dvx: dvx, vxt: vxt ]
+
+        # TODO more specific event?
+        update(
+          position: current.position,
+          velocity: [vxt, vy],
+          updated_at: Time.now
+        )
+      end
+
+      def jump
+        p [ :jump, current: current ]
+        vx, vy = *current.velocity
+        return if vy.abs > 0.0 
+
+        dvy = leg_strength
+        update(
+          position: current.position,
+          velocity: [vx, vy + dvy],
+          updated_at: Time.now
+        )
+      end
+
+      def current
+        @body = body.at(Time.now, obstacles: space.obstacles)
+      end
+
+      def body
+        construct_body
+      end
+
+      def construct_body
+        # ...integrate physicist bodies...
+        Physicist::Body.new(
+          position: position,
+          velocity: velocity,
+          t0: updated_at || Time.now,
+          dimensions: [1,1]
+        )
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/models/space.rb

@@ -0,0 +1,14 @@
+module Physicist
+  module Laboratory
+    class Space < Metacosm::Model
+      has_many :scientists
+
+      # attr_accessor :scientists
+      attr_accessor :grid_map
+
+      def obstacles
+        SimpleBody.collection_from_tiles(grid_map)
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/screen.rb

@@ -0,0 +1,52 @@
+module Physicist
+  module Laboratory
+    class Screen < Dedalus::Screen
+      include Dedalus::Elements
+      attr_accessor :scientist, :map_grid, :camera
+
+      def show
+        [
+          Paragraph.new(text: "Welcome to the lab, #{scientist.display_name}!"),
+          Paragraph.new(text: "Pos: #{scientist.current.position}"),
+          Paragraph.new(text: "Vel: #{scientist.current.velocity}"),
+          field
+        ]
+      end
+
+      def field
+        SpriteField.new(
+          grid: map_grid,
+          scale: 1.0,
+          camera_location: camera,
+          tiles_path: "media/images/tiles.png",
+          tile_width: 64,
+          tile_height: 64,
+          tile_class: "Dedalus::Elements::MapTile",
+          sprite_map: sprite_map
+        )
+      end
+
+      def sprite_map
+        { scientist.current.position => [avatar_for(scientist)] }
+      end
+
+      def avatar_for(scientist)
+        Dedalus::Elements::Sprite.new(
+          path: 'media/images/walk.png',
+          frame: 0,
+          invert_x: false,
+          asset_width: 64,
+          asset_height: 64,
+          scale: 1.0
+        )
+      end
+
+      def heading
+        [
+          Heading.new(text: "[Physics Laboratory]"),
+          Paragraph.new(text: "Hello, #{scientist.name_with_title}")
+        ]
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/view.rb

@@ -0,0 +1,27 @@
+module Physicist
+  module Laboratory
+    class View < Dedalus::ApplicationView
+      def app_screen
+        Screen.new(
+          scientist: scientist_view,
+          map_grid: application.workspace_view.grid_map,
+          camera: camera_location
+        )
+      end
+
+      def scientist_view
+        application.scientist_view
+      end
+
+      def tile_size
+        64
+      end
+
+      def camera_location
+        cx, cy = *scientist_view.current.position
+        mx, my = (window.width / 2) / tile_size, (window.height / 2) / tile_size
+        [ cx - mx, cy - my ]
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/views/scientist_view.rb

@@ -0,0 +1,57 @@
+require 'ostruct'
+module Physicist
+  module Laboratory
+    class ScientistView < Metacosm::View
+      attr_accessor :scientist_id, :space_id
+      attr_accessor :display_name, :position, :velocity, :t0
+
+      after_update {
+        @body = construct_body
+      }
+
+      def current # at(t)
+        @body = body.at(Time.now, obstacles: workspace_view.obstacles)
+      end
+
+      def workspace_view
+        WorkspaceView.find_by(space_id: space_id)
+      end
+
+      def body
+        # ... integrate physicist bodies ...
+        @body ||= construct_body
+      end
+      
+      def construct_body
+        Physicist::Body.new(
+          position: position,
+          velocity: velocity,
+          t0: t0 || Time.now,
+          dimensions: [1,1]
+        )
+      end
+    end
+
+    class NullScientistView
+      def display_name
+        'Nohbdy'
+      end
+
+      def position
+        [0,0]
+      end
+
+      def velocity
+        [0,0]
+      end
+
+      def space_id
+        nil
+      end
+
+      def current
+        OpenStruct.new(position: position, velocity: velocity)
+      end
+    end
+  end
+end

data/lib/physicist/laboratory/views/workspace_view.rb

@@ -0,0 +1,18 @@
+module Physicist
+  module Laboratory
+    class WorkspaceView < Metacosm::View
+      # has_many :scientist_views
+      attr_accessor :space_id, :grid_map
+
+      def obstacles
+        SimpleBody.collection_from_tiles(grid_map)
+      end
+    end
+
+    class NullWorkspaceView
+      def grid_map
+        [[1,2],[3,4]]
+      end
+    end
+  end
+end

data/lib/physicist/simple_body.rb

@@ -0,0 +1,26 @@
+module Physicist
+  class SimpleBody
+    attr_reader :position, :dimensions
+
+    def initialize(position:,dimensions:)
+      @position = position
+      @dimensions = dimensions
+    end
+
+    def self.collection_from_tiles(tile_grid)
+      # p [ :assembling_bodies_from_tiles, grid: tile_grid ]
+      simple_bodies = []
+
+      tile_grid.each_with_index do |row, y|
+        row.each_with_index do |cell, x|
+          if cell
+            simple_bodies << new(position: [x,y], dimensions: [1,1])
+          end
+        end
+      end
+
+      # p [ bodies: simple_bodies ]
+      simple_bodies
+    end
+  end
+end

data/lib/physicist/version.rb

@@ -1,4 +1,4 @@
 module Physicist
   # physicist version
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/physicist.rb

@@ -1,120 +1,6 @@
-require 'physicist/version'
-
-module Physicist
-  class SimpleBody
-    attr_reader :position, :dimensions
-
-    def initialize(position:,dimensions:)
-      @position = position
-      @dimensions = dimensions
-    end
-  end
-
-  class Body
-    attr_reader :position, :velocity, :t0, :dimensions
-
-    def initialize(position:, velocity:, t0:, dimensions:)
-      @position = position
-      @velocity = velocity
-      @dimensions = dimensions
-      @t0 = t0
-    end
-
-    def width
-      dimensions[0]
-    end
-
-    def height
-      dimensions[1]
-    end
-
-    def at(t, obstacles:[])
-      x0,y0   = *position
-      vx0,vy0 = *velocity
-
-      dt = t - t0
-
-      vx = vx0 # - dry friction ?
-      vy = vy0 + (gravity * dt)
-
-      next_y_obstacle = next_obstacle_on_y_axis(vy,t,obstacles:obstacles)
-
-      if next_y_obstacle
-        distance_to_next_y_obstacle =
-          if vy > 0
-            ((y0+height) - next_y_obstacle.position[1]).abs
-          else
-            (y0 - next_y_obstacle.position[1]).abs
-          end
-            # if vy > 0
-            #   distance_to_next_y_obstacle -= height
-            # end
-
-        distance_travelled_in_y_axis_if_no_obstacles = (vy * dt)
+require 'gosu' # note: must require gosu *first*
+require 'dedalus'
 
-        # require 'pry'
-        # binding.pry
-
-        if distance_travelled_in_y_axis_if_no_obstacles < distance_to_next_y_obstacle
-          # the no-obstacles within relevant distance case
-          # # TODO handle other coordinate (x)
-          x = x0 + (vx * dt)
-          y = y0 + (vy * dt)
-
-        else
-          # TODO handle other coordinate here too...
-          x = x0 + (vx * dt)
-          y = y0 + distance_to_next_y_obstacle # - height
-          vy = 0
-        end
-      else
-        x = x0 + (vx * dt)
-        y = y0 + (vy * dt)
-      end
-
-      Body.new(
-        position: [x,y],
-        velocity: [vx,vy],
-        dimensions: dimensions,
-        t0: t
-      )
-    end
-
-    def next_obstacle_on_y_axis(vy,t,obstacles:)
-      x0,y0 = *position
-
-      obstacles_along_axis = obstacles.select do |obstacle|
-        ox,_ = *obstacle.position
-        ow,_ = *obstacle.dimensions
-        ox <= x0 + width && x0 <= ox + ow
-      end
-
-      obstacles_in_direction_of_movement = if vy > 0
-        obstacles_along_axis.select do |obstacle|
-          _,oy = *obstacle.position
-          # _,oh = *obstacle.dimensions
-
-          oy >= y0 + height # && y0 < oy + oh
-        end
-      elsif vy < 0
-        obstacles_along_axis.select do |obstacle|
-          _,oy = *obstacle.position
-          _,oh = *obstacle.dimensions
-
-          oy + oh <= y0 # + height # && y0 > oy + oh
-        end
-      end
-
-
-      obstacles_in_direction_of_movement.min_by do |obstacle|
-        _,oy = *obstacle.position
-        # distance to me
-        (y0 - oy).abs
-      end
-    end
-
-    def gravity
-      9.8
-    end
-  end
-end
+require 'physicist/version'
+require 'physicist/simple_body'
+require 'physicist/body'

data/spec/physicist_spec.rb

@@ -88,7 +88,7 @@ describe Body do
         context "with an obstacle directly beneath the body" do
           let(:obstacles) do
             [
-              SimpleBody.new(position: [ x0, y0 + height ], dimensions: [ width, height ]) 
+              SimpleBody.new(position: [ x0, y0 + height ], dimensions: [ width, height ])
             ]
           end
 
@@ -96,7 +96,7 @@ describe Body do
             _,vy = *body_at_t.velocity
             _,y = *body_at_t.position
             expect(vy).to eq(0)
-            expect(y0).to eq(y)
+            expect(y0 + 0.99).to eq(y)
           end
         end
 
@@ -113,7 +113,7 @@ describe Body do
           it 'should stop vertical movement after 1s' do
             _,vy = *body_at_t.velocity
             _,y = *body_at_t.position
-            expect(y0 + 9.8).to eq(y)
+            expect(y0 + 10.79).to eq(y)
             expect(vy).to eq(0)
           end
         end
@@ -124,8 +124,8 @@ describe Body do
           it 'should be in freefall' do
             _,vy = *body_at_t.velocity
             _,y = *body_at_t.position
-            expect(y0 + 9.8).to eq(y)
-            expect(vy).to eq(9.8)
+            expect(y0 + 50.0).to eq(y)
+            expect(vy).to eq(50.0)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: physicist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,8 +134,31 @@ files:
 - features/step_definitions/physicist_steps.rb
 - gemspec.yml
 - lib/physicist.rb
-- lib/physicist/laboratory.rb
+- lib/physicist/body.rb
+- lib/physicist/laboratory/app.rb
+- lib/physicist/laboratory/commands/create_scientist.rb
+- lib/physicist/laboratory/commands/jump_scientist.rb
+- lib/physicist/laboratory/commands/move_scientist.rb
+- lib/physicist/laboratory/events/scientist_created_event.rb
+- lib/physicist/laboratory/events/scientist_updated_event.rb
+- lib/physicist/laboratory/events/space_created_event.rb
+- lib/physicist/laboratory/handlers/create_scientist_handler.rb
+- lib/physicist/laboratory/handlers/jump_scientist_handler.rb
+- lib/physicist/laboratory/handlers/move_scientist_handler.rb
+- lib/physicist/laboratory/listeners/scientist_created_event_listener.rb
+- lib/physicist/laboratory/listeners/scientist_updated_event_listener.rb
+- lib/physicist/laboratory/listeners/space_created_event_listener.rb
+- lib/physicist/laboratory/models/scientist.rb
+- lib/physicist/laboratory/models/space.rb
+- lib/physicist/laboratory/screen.rb
+- lib/physicist/laboratory/view.rb
+- lib/physicist/laboratory/views/scientist_view.rb
+- lib/physicist/laboratory/views/workspace_view.rb
+- lib/physicist/simple_body.rb
 - lib/physicist/version.rb
+- media/images/cosmos.jpg
+- media/images/tiles.png
+- media/images/walk.png
 - physicist.gemspec
 - spec/physicist_spec.rb
 - spec/spec_helper.rb

data/lib/physicist/laboratory.rb

@@ -1 +0,0 @@
-# a tiny dedalus app for visually checking physicist flow?