Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions drone_simulation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ project(drone_simulation CXX)
add_library(drone_simulation_lib
src/simulation.cpp
src/solvers/analytical_solver.cpp
src/solvers/table_solver.cpp
src/providers/json_target_provider.cpp
src/config_loaders/file_config_loader.cpp
src/config_loaders/factory.cpp
src/mission_processor.cpp
src/drone_states/state_stopped.cpp
src/drone_states/state_accelerating.cpp
src/drone_states/state_decelerating.cpp
src/drone_states/state_turning.cpp
src/drone_states/state_moving.cpp
)
target_include_directories(drone_simulation_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_compile_options(drone_simulation_lib PRIVATE -Wall -Wextra -pedantic)
Expand Down
14 changes: 7 additions & 7 deletions drone_simulation/data/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
{
"name": "VOG-17",
"mass": 0.35,
"drag": 0.07,
"drag": 0.004,
"lift": 0
},
{
"name": "M67",
"mass": 0.6,
"drag": 0.1,
"drag": 0.005,
"lift": 0
},
{
"name": "RKG-3",
"mass": 1.2,
"drag": 0.1,
"drag": 0.007,
"lift": 0
},
{
"name": "GLIDING-VOG",
"mass": 0.45,
"drag": 0.1,
"lift": 1
"drag": 0.005,
"lift": 0.005
},
{
"name": "GLIDING-RKG",
"mass": 1.4,
"drag": 0.1,
"lift": 1
"drag": 0.007,
"lift": 0.005
}
]
Loading
Loading