Commit Graph

258 Commits

Author SHA1 Message Date
Hong Chen
02130cea9f Restore the whitespaces to their original state before the update in order to show the necessary file changes for the PR. 2024-12-17 18:26:35 -06:00
Hong Chen
36acb0e862 Test to change from CC = cc to CC = gcc for only needed files. 2024-12-17 17:24:12 -06:00
Nino Tarantino
31961f482c Don't override the CC and C++ environment variables
Fixes an issue where some makefiles override the user's CC and C++
environment variables.
2024-12-06 08:39:20 -06:00
Aditya Girish
0292b52cf7
Added graphics client for SIM rigid body. (#1779)
* added SIM_singlerigidbody

* Added matrix operations file.

* Imported libraries and declared variables.

* New objects and more defined values.

* Declared more variables and added AzElRot. function.

* Sockets and file connections 1

* Adding to variable server.

* Variables for the variable server.

* Variable parsing added.

* Vertex model for crewModule; need to change to sphere later.

* Body and vantage positioning functions.

* Drawing functions to create the model.

* Finished drawing functions for world.

* Changed some of the object names and variable names for sync.

* Added Makefile.

* Added POM file.

* Graphics client starter added to input file.

* Changed paths in S_define to reflect current file structure.

* More accurate cd error message in input file.

* Color hardcoded for testing purposes and getting the sim running.

* S_overrides changed to include graphics cleaning for each sim execution.

* S_define formatted for better readability.

* Changed shape to a dodecahedron.

* Path changed for input file.

* Airport commit

* New edges for dodecahedron.

* Triangle normals for the dodecahedron changed.

* Sim variable parsing fixed for functionality.

* Edges of dodecahedron fixed.

* Changed paint color for the shape to change based on location.

* Deleted unnecessary JViewport library.

* Increased length of x, y, and z axis lines.

* Increased vantage distance.

* Fixed triangles and normals.

* Commented on the edges.

* Deleted the notes file.

* Removed trick.frame_long_on() from splashdown SIM's realtime.py in modified data directory.

* Deleted sims directory (including images sub directory).

* Removed unnecessary body.hh and body.cpp from subdirectory.

* Removed unnecessary files.

---------

Co-authored-by: Wallace <bnwalla1@scooby.trick.gov>
Co-authored-by: AdityaGirish <aditya.girish@nasa.gov>
2024-11-12 11:23:32 -06:00
bnwalla1
7bc6ab74a8
added SIM_singlerigidbody (#1762)
* added SIM_singlerigidbody

* Removed a few sections in the README file

* Removed the sims directory

* Added shutdown job and made minor changes to body.cpp

---------

Co-authored-by: Wallace <bnwalla1@scooby.trick.gov>
2024-10-16 14:37:48 -05:00
Pherring04
d997759a6d
Water Clock Cleanup (#1711)
* Cleaned up Water Clock and added C interface support for message subscriptions

* Added support for message publishers in C interface

* Revert "Added support for message publishers in C interface"

This reverts commit e3233891d7.
2024-05-23 10:30:56 -05:00
jmpenn
ee2f824550
Disable unneeded SimObjects from default_trick_sys.sm in Trick exampl… (#1719)
* Disable unneeded SimObjects from default_trick_sys.sm in Trick example sims.

* Take out unit test disable. Add some S_defines I forgot.
2024-05-23 10:12:27 -05:00
jmpenn
5065d96a15
Pre-increment (rather than post-increment) STL iterators in for loops… (#1692)
* Pre-increment (rather than post-increment) STL iterators in for loops. #1594

* Fix a goof. #1594
2024-04-18 11:41:35 -05:00
Pherring04
e515144252
Water Clock Sim v3 (#1668)
* Added Water Clock Sim

* Updated graphics and documentation

* Added images for README

* Typos in README

---------

Co-authored-by: Pherring04 <plherrin@JSLRL0523040929.ndc.nasa.gov>
2024-04-18 11:24:02 -05:00
jmpenn
f475627ef7
Fix SIM_lander input file. (#1686) 2024-04-01 11:57:28 -05:00
jmpenn
6bbd4ea1df
Add Submarine simulation (#1629) 2023-12-19 15:23:34 -06:00
Andyj4586
06a1d2bf2e
Modified display for SIM_wheelbot (#1541)
* modified Java display for SIM_wheelbot so when RUN_mouse is used, images of waypoints stop being drawn when mouse arrives at waypoint.

* removed spaces at beginning of each line in SIM_Wheelbot/models/graphics/src/trick/EVDisplay.java
2023-08-24 13:52:45 -05:00
Jacqueline Deans
c2e42f4ef4 Refactor and test Variable Server.
- Split VariableServerThread into VariableServerSession and VariableReference classes
- Use C++ streams for data handling
- Unit tests
2023-06-26 12:23:58 -05:00
Sean Harmeyer
fd8252e2c5
Sim robot (#1498)
* First commit of SIM_robot.

* Updates to kinematic arm with controller

* Working well enough, still needs some user interface besides trick-TV

* Add end-effector path trace to graphics client.

* Singularity control bug, remove printouts, udpate makefile

* Improve SIM_robot variable server client.

* Tidy up RobotDisplay.java

* Tidying up

* Removing warnings

* Working on documentation

* Updating documentation

* Updating docs

* Adding figures for documentation

* Removing some stuff in the README carried over from the template

* Tidying up

* Position vector finally done

* Updating based on feedback

* Forward position kinematics completed with notation changes

* First pass documentation done?

* remove printout

* Fix typos in text and filenames

* Update README.md

* Update README.md

* made it smaller

---------

Co-authored-by: John M. Penn <john.m.penn@nasa.gov>
2023-05-12 10:46:51 -05:00
jmpenn
78bc708f0f
Update README.md 2023-04-18 12:46:02 -05:00
John M. Penn
60097a3931 Fix rendering of conditional equations in SIM_aircraft. 2023-04-18 12:43:54 -05:00
Mrockwell2
aed99ab1fd
SIM_aircraft Waypoint Update (#1466)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Created a menu bar for the GUI

* Minor README fix and file cleanup

* Implemented a view menu to hide and show the info on the map

* Cleared out commented code.

* Last minute code cleanup and update of the documentation.

* Updated the View menu with more options and updated documentation.

* Testing basic Variable Server Client usage.

* Waypoints shared from sim to graphics client.
Need to use list and fix some formatting.

* Refactored and simplified Waypoint implementation

* Documentation and comment updates

* Simplified waypoint structure
Implemented file support in graphics client

* Updated Documentation

* Created a default waypoint icon when unspecified

* Fixed privacy issues in the WaypointList class

* Cleaned up unnecessary file and added comments
2023-04-13 10:50:36 -05:00
John M. Penn
539989469c Fix sprintf problem in SIM_sun. #1464 2023-03-01 14:45:23 -06:00
Mrockwell2
29fb20c2eb
SIM_aircraft Graphics Client View Menu (#1457)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Created a menu bar for the GUI

* Minor README fix and file cleanup

* Implemented a view menu to hide and show the info on the map

* Cleared out commented code.

* Last minute code cleanup and update of the documentation.

* Updated the View menu with more options and updated documentation.
2023-02-21 10:49:00 -06:00
Mrockwell2
28d5ecfa84
SIM_aircraft Waypoint Update (#1453)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Minor README fix and file cleanup
2023-02-13 16:45:15 -06:00
John M. Penn
917cd84dfc Merge branch 'master' of https://github.com/nasa/trick 2023-02-01 14:46:42 -06:00
John M. Penn
2b308bd89c Add README to SIM_aircraft. 2023-02-01 14:46:14 -06:00
jmpenn
4879bcfc51
Use Maven to build AircraftDisplay.jar instead of directly from Makefile. (#1435) 2023-01-24 17:19:19 -06:00
jmpenn
1b2203b867
Merge Sim aircraft into master (#1429)
* Initial commit of SIM_aircraft

* Add SIM_aircraft variable server client  (#1394)

* Add control panel

* Remove comments

* Add Makefile

Co-authored-by: Zero Nelson <zeronelson13@gmail.com>

Co-authored-by: zeronelson <95947013+zeronelson@users.noreply.github.com>
Co-authored-by: Zero Nelson <zeronelson13@gmail.com>
2023-01-18 11:49:09 -06:00
Cody Martin
3870dc73b6
Improve tutorial documentation (#1408) 2022-12-02 14:55:40 -06:00
Jacqueline Deans
d9e7ac250d
Refactored sim tests to run through TrickOps (#1390) 2022-11-17 15:43:29 -06:00
Jacqueline Deans
f84c744a65
Add .class files to sim directory gitignore [no ci] 2022-11-17 08:42:47 -06:00
jmpenn
2a03ff5cf4
Replace sprintf with snprintf in all of Trick source. #1384 (#1392)
* Replace sprintf with snprintf in all of Trick source. #1384

* Don't add -Werror for MacOS because of deprecated sprintf warnings which we cant get rid of because SWIG. #1384

* Fixed an unbalanced parenthesis in S_overrides.mk. #1384
2022-11-15 15:00:05 -06:00
Jacqueline Deans
9c8799610f
Variable Server - var_send_once and integration test (#1330)
* Adds the send_once command and message type, which allows a user to request a variable to be sent immediately and only once (intended to replace the var_add, var_send, var_clear idiom that is commonly used for this purpose)
* Minor refactoring of variable server internals to reduce repeated code
* Adds SIM_test_varserv to integration test to test basic variable server functionality
* Changes graphics client for SIM_billiards to use var_send_once as an example of intended use
* Add documentation for var_send_once in docs and tutorial
* Set exit_code_enabled in trick unit tests to be true by default
* Patch for failing bookworm build
2022-08-18 10:47:07 -05:00
John M. Penn
36416c1973 Refactoring of CrewModule Graphics client in SIM_splashdown #1322 2022-07-27 16:07:50 -05:00
Scott Fennell
2dd12fcbb6
#1315 parse websocket msg len for correct data (#1316)
closes #1315
2022-07-27 08:40:40 -05:00
Jacqueline Deans
b69475175d Minor improvement to SIM_billiards 2022-07-20 15:56:02 -05:00
Jacqueline Deans
790ec56816
Merge pull request #1306 from nasa/1299-sim-pool
Trick Billiards Simulation (#1299)
2022-07-20 11:37:13 -05:00
Jacqueline Deans
ff18faf6dc Refactor graphics client to run in a single thread; remove extraneous files 2022-07-14 16:07:14 -05:00
Deans
ad5be89c4a Adding fully function simulation 2022-07-14 11:05:56 -05:00
Deans
8537601ccb Saving working state 2022-07-14 09:17:00 -05:00
Jacqueline Deans
b869f851f5 Add progress on SIM_pool 2022-07-01 09:40:37 -05:00
Scott Fennell
866c21d5a5
include freeze time tics in calculation for websocket data intervals (#1296) 2022-06-28 17:20:50 -05:00
John M. Penn
54b86cfb74 Stop ignoring makefile inside SIM_balloon/models/graphics directory. 2022-06-23 16:48:10 -05:00
John M. Penn
2b5735328f Add gitignore to stop ignoring makefiles. 2022-06-23 16:36:34 -05:00
John M. Penn
b962f692ef fix BalloonDisplay pom file, and SIM_balloon input file. 2022-06-23 15:45:36 -05:00
John M. Penn
e8d40d4f07 Build BalloonDisplay with Maven. 2022-06-22 18:18:23 -05:00
John M. Penn
76e94c6dcb Fix broken links in SIM_splashdown README.md. #1289 2022-06-17 10:53:36 -05:00
John M. Penn
4dcae748c8 Improvements to SIM_splashdown code while writing documentation. #1289 2022-06-16 18:44:49 -05:00
John M. Penn
dc4c91d69f Add documentation to example simulation: SIM_splashdown #1289 2022-06-16 18:27:20 -05:00
John M. Penn
ae55e7f5ab Update input files to be happy with Python 3. #1280 #706 2022-06-02 15:46:38 -05:00
John M. Penn
9e0be47b46 Tidy up the SIM_splashdown graphics client. #1266 2022-05-24 16:16:58 -05:00
John M. Penn
03dd6bd313 Tidy up dynamics code and GUI client. #1266 2022-05-21 23:56:25 -05:00
John M. Penn
3171c71cb7 Change graphics client build message. #1266 2022-05-20 15:31:07 -05:00
John M. Penn
7747b53ea1 Initial commit of SIM_splashdown. #1266 2022-05-20 15:20:45 -05:00