Sceptique/ZeroEpsilon
1
1
Fork 0
Code Issues 14 Pull Requests Packages Projects 2 Releases Wiki Activity

Compare commits

base: Sceptique:master
Branches Tags
Sceptique:master
Sceptique:test-sfml-draw-grid
Sceptique:event-as-general-entity
..
compare: Sceptique:test-sfml-draw-grid
Branches Tags
Sceptique:master
Sceptique:test-sfml-draw-grid
Sceptique:event-as-general-entity

No commits in common. "master" and "test-sfml-draw-grid" have entirely different histories.
master ... test-sfml-

5 changed files with 18 additions and 114 deletions
Show Stats Expand all files Collapse all files

3
Makefile
View File

@ -25,8 +25,7 @@ deps_update:
deps_opt:
@[ -d lib/ ] || make deps
doc:
crystal docs ./src/zero_epsilon.cr ./src/tests/physics_sandbox.cr ./lib/crsfml/src/crsfml.cr ./lib/imgui/src/imgui.cr ./lib/imgui-sfml/src/imgui-sfml.cr
crystal docs ./src/zero_epsilon.cr ./src/tests/physics_sandbox.cr ./lib/crsfml/src/crsfml.cr ./lib/imgui/src/imgui.cr
clean:
rm $(NAME)

10
src/engine/gravity/body.cr
View File

@ -11,15 +11,9 @@ module Gravity
EARTH2 = Gravity::Body(2).new(mass: 5972200000000000000000000.0, position: Vector(Float64, 2).zero)
EARTH3 = Gravity::Body(3).new(mass: 5972200000000000000000000.0, position: Vector(Float64, 3).zero)
getter :mass, :position, :g, :name
getter :mass, :position, :g
@@name_idx = 0
def self.next_name
@@name_idx += 1
"default~#{@@name_idx}"
end
def initialize(@mass : Float64, @position : Vector(Float64, N) = Vector(Float64, N).zero, @g : Float64 = G, @name : String = Body(0).next_name)
def initialize(@mass : Float64, @position : Vector(Float64, N) = Vector(Float64, N).zero, @g : Float64 = G)
end
def acceleration(position : Vector(Float64, N)) : Vector(Float64, N)

15
src/engine/projectable.cr
View File

@ -2,18 +2,10 @@ require "crsfml"
require "./gravity"
# TODO move this to engine
class Projectable(N)
property :gravity_body, :color, :size, :outline_color, :outline_size
@@hook_new : Proc(Projectable(2), Nil) = ->(obj : Projectable(2)) { nil }
def self.set_hook_new(hook_proc : Proc(Projectable(2), Nil))
@@hook_new = hook_proc
end
def trigger_hook_new
@@hook_new.call(self)
end
def initialize(
@gravity_body : Gravity::Body(N),
@color : Tuple(Int32, Int32, Int32),
@ -21,11 +13,6 @@ class Projectable(N)
@outline_color : Tuple(Int32, Int32, Int32) = {0, 0, 0},
@outline_size : Int32 = 0
)
trigger_hook_new
end
def name
@gravity_body.name
end
def position

65
src/tests/physics_sandbox.cr
View File

@ -24,11 +24,9 @@ class Game
@screen_center_position : Vector(Float64, 2)
@center_position : Vector(Float64, 2)
@joystick_moved : Vector(Float64, 2)
@selected_projectable : Projectable(2)
@click_coordinates : Vector(Float64, 2)?
SECOND_IN_NANO = 1_000_000_000
DEFAULT_ZOOM = 3/16
DEFAULT_ZOOM = 5/16
def accuracy_frequency_nano_rate
((SECOND_IN_NANO * @timescale) // @framerate).to_u64
@ -87,17 +85,10 @@ class Game
# # What's the current position of the Y axis on joystick #0?
# position = SF::Joystick.get_axis_position(0, SF::Joystick::Y)
@click_coordinates = nil
@projectables = Array(Projectable(2)).new
Projectable(2).set_hook_new ->(projectable : Projectable(2)) {
@projectables << projectable
}
sun_offset = Vector[3*10.0**11, 3*10.0**11]
@bodies = {
vessel: Gravity::MovingBody(2).new(name: "vessel", mass: 1.0, g: 0.1, position: Vector[10.0, 10.0]),
star: Gravity::MovingBody(2).new(name: "star", mass: 300000.0, g: 0.1, position: Vector[1000.0, 1000.0], speed: Vector[0.0, 0.0]),
vessel: Gravity::MovingBody(2).new(mass: 1.0, g: 0.1, position: Vector[10.0, 10.0]),
star: Gravity::MovingBody(2).new(mass: 300000.0, g: 0.1, position: Vector[1000.0, 1000.0], speed: Vector[0.0, 0.0]),
pla1: Gravity::MovingBody(2).new(mass: 15000.0, g: 0.1, position: Vector[500.0, 500.0], speed: Vector[12.0, 0.0]),
pla2: Gravity::MovingBody(2).new(mass: 18000.0, g: 0.1, position: Vector[1000.0, 1500.0], speed: Vector[-6.0, -6.0]),
pla3: Gravity::MovingBody(2).new(mass: 12000.0, g: 0.1, position: Vector[1500.0, 1500.0], speed: Vector[-6.0, 0.0]),
@ -133,10 +124,9 @@ class Game
color: {50, 150, 50},
size: 10,
)
# @projectables = {
# @star, @pla1, @pla2, @pla3, @star, @vessel_p,
# }
@selected_projectable = @vessel_p
@projectables = {
@star, @pla1, @pla2, @pla3, @star, @vessel_p,
}
@g = Gravity::Field(2).new(@gravited)
@vessel = Vessel(2).new(name: "Starbird", gravity_body: @bodies[:vessel], gravity_field: @g)
@vessel.navigation.zoom_ratio = DEFAULT_ZOOM
@ -144,8 +134,6 @@ class Game
@ui_events_handler = UI::EventHandler.new
end
MAX_DISTANCE_TO_SELECT_PROJECTABLE = 15
def handle_events
joystick_moved_modified = false
@ -156,47 +144,11 @@ class Game
when SF::Event::Closed
@window.close
exit
when SF::Event::Resized
@width = event.width.to_i32
@height = event.height.to_i32
@view.viewport = default_viewport
@center_position = Vector[0.0, 0.0]
@view.center = {@center_position[0], @center_position[1]}
@window.view = @view
when SF::Event::KeyPressed
Log.debug "KeyPressed #{event}"
when SF::Event::MouseMoved
when SF::Event::MouseButtonReleased
clicked_on_imgui_item = ImGui.is_any_item_hovered || ImGui.is_any_item_active
if !clicked_on_imgui_item
# don't match if click on the buttons of ImGui
# click_coord = @window.map_pixel_to_coords({event.x, event.y}, @view)
# m = (proj.position - Vector[click_coord.x, click_coord.y]).magnitude
# mmhhhh it does not work as expected, bugged
event_position = Vector[event.x, event.y]
nearest_proj = @projectables.map do |projectable|
pixel = @window.map_coords_to_pixel({projectable.position[0], projectable.position[1]}, @view)
{
projectable: projectable,
distance: (Vector[pixel.x, pixel.y] - event_position).magnitude,
}
end.sort_by!{ |tuple| tuple[:distance] }.first
if nearest_proj[:distance] <= MAX_DISTANCE_TO_SELECT_PROJECTABLE
@selected_projectable.outline_color = {0, 0, 0}
@selected_projectable.outline_size = 0
@selected_projectable = nearest_proj[:projectable]
@selected_projectable.outline_color = {255, 0, 0}
@selected_projectable.outline_size = 5
pp "Select a new body #{@selected_projectable.name}"
@click_coordinates = nil
else
@selected_projectable.outline_color = {0, 0, 0}
@selected_projectable.outline_size = 0
@click_coordinates = Vector[event.x.to_f64, event.y.to_f64]
end
end
when SF::Event::MouseButtonEvent
pp "MouseButtonEvent #{event}"
Log.debug "MouseButtonEvent #{event}"
when SF::Event::JoystickButtonPressed
@joystick_moved.zero! # reset 0
joystick_moved_modified = :vector # force exact set
@ -268,7 +220,6 @@ class Game
@graviting.each { |graviting| accelerate_by_tick(graviting) }
draw_bridge(gravity_field)
draw_bodies
object_position =
if @vessel.navigation.zoom_select == 0
@ -334,4 +285,4 @@ class Game
end
end
Game.new(framerate: 120, width: 800, height: 600).execute_loop
Game.new(framerate: 120, width: 1200, height: 1000).execute_loop

37
src/tests/physics_sandbox/draw.cr
View File

@ -36,8 +36,7 @@ module PhysicsSandboxDraw
label: "Set timescale###set_timescale",
data: @timescale,
min: 0.1,
max: 60,
# max: 3600 * 24 * 7,
max: 3600 * 24 * 7,
flags: (
ImGui::ImGuiSliderFlags::Logarithmic
),
@ -296,23 +295,15 @@ module PhysicsSandboxDraw
def draw_navigation(gravity_field)
# ImGui.text "Total Accele is : [#{acceleration[0].round(4)}, #{acceleration[1].round(4)}] m/s²"
draw_table(title: "Applied forces", headers: {"Name", "X", "Y", "unit"}) do
draw_table_line "Pulse Accele", "#{@vessel.gravity_body.acceleration[0].round(4)}", "#{@vessel.gravity_body.acceleration[1].round(4)}", "m/s²"
draw_table_line "Gravitic Field", "#{gravity_field[0].round(4)}", "#{gravity_field[1].round(4)}", "m/s²"
end
ImGui.text "Current speed #{@vessel.gravity_body.speed.magnitude.round(4)} m/s"
ImGui.text ""
ImGui.text "Pulse Accele is : [#{@vessel.gravity_body.acceleration[0].round(4)}, #{@vessel.gravity_body.acceleration[1].round(4)}] m/s²"
ImGui.text "GraviticBody is : [#{gravity_field[0].round(4)}, #{gravity_field[1].round(4)}] m/s²"
ImGui.text "Current speed is : #{@vessel.gravity_body.speed.magnitude.round(4)} m/s"
relative_speed = @vessel.gravity_body.speed - @selected_projectable.speed
draw_table(title: "Actual vectors", headers: {"Name", "X", "Y", "unit"}) do
draw_table_line "Position", @vessel.gravity_body.position[0].round(3).to_s, @vessel.gravity_body.position[1].round(3).to_s, "m"
draw_table_line "Speed", @vessel.gravity_body.speed[0].round(3).to_s, @vessel.gravity_body.speed[1].round(3).to_s, "m/s"
draw_table_line "Acceleration", @vessel.gravity_body.acceleration[0].round(3).to_s, @vessel.gravity_body.acceleration[1].round(3).to_s, "m/s²"
draw_table_line "Selected body", "#{@selected_projectable.position[0].round(4)}", "#{@selected_projectable.position[1].round(4)}", "m"
draw_table_line "", @selected_projectable.name, "", ""
draw_table_line "Relative speed", "#{relative_speed[0].round(4)}", "#{relative_speed[1].round(4)}", "m/s"
end
ImGui.text ""
ImGui.text "Zoom on"
ImGui.radio_button("vessel##navigation_zoom", pointerof(@vessel.navigation.zoom_select), 0)
@ -345,6 +336,7 @@ module PhysicsSandboxDraw
end
def draw_bridge(gravity_field)
if ImGui.begin("Bridge")
if ImGui.tree_node_ex("Captain", ImGui::ImGuiTreeNodeFlags.new(ImGui::ImGuiTreeNodeFlags::DefaultOpen))
draw_captain
@ -365,23 +357,4 @@ module PhysicsSandboxDraw
end
end
def draw_bodies
if ImGui.begin("Bodies")
if ImGui.tree_node_ex("Bodies", ImGui::ImGuiTreeNodeFlags.new(ImGui::ImGuiTreeNodeFlags::DefaultOpen))
draw_table(title: "Bodies", headers: {"Name", "X", "Y"}) do
@projectables.each do |projectable|
draw_table_line projectable.name, projectable.position[0].to_s, projectable.position[1].to_s
end
if !(click_coordinates = @click_coordinates).nil?
draw_table_line "[click]", click_coordinates[0].to_s, click_coordinates[1].to_s
end
end
ImGui.tree_pop
end
ImGui.end
end
end
end