Pipe wires #65
Merged
Pipe wires #65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
z-adams
commented
Feb 12, 2021
|
Fix "quanta" in accordance with #61 (comment) |
|
More quanta improvements; |
Capital-Asterisk
requested changes
Feb 12, 2021
jonesmz
reviewed
Feb 13, 2021
| @@ -61,16 +61,15 @@ WireOutput* MachineRocket::request_output(WireOutPort port) | |||
|
|
|||
| std::vector<WireInput*> MachineRocket::existing_inputs() | |||
| { | |||
| /*std::vector<WireInput*> inputs; | |||
| std::vector<WireInput*> inputs; | |||
There was a problem hiding this comment.
seems a bit weird to use a raw pointer for something that you know is always non-null.
std::reference_wrapper might be closer to what you really want.
There was a problem hiding this comment.
@Capital-Asterisk what do you think of this? I was just following the convention of the other existing_inputs() functions, should we change all of these to references instead of pointers?
There was a problem hiding this comment.
I want the entire wiring system dead, so there isn't really a point. Changing the syntax won't untangle the spaghetti.
jonesmz
reviewed
Feb 13, 2021
jonesmz
reviewed
Feb 13, 2021
jonesmz
reviewed
Feb 13, 2021
jonesmz
reviewed
Feb 13, 2021
jonesmz
reviewed
Feb 13, 2021
jonesmz
approved these changes
Feb 13, 2021
Closed
Capital-Asterisk
approved these changes
Feb 15, 2021
New `Pipe` wire payload exposes a MachineContainer (or any other entity) for direct access by the pipe output. This is used by MachineRocket to perform instant fuel draw from its fuel recepticle, to prevent engines drawing more fuel than is available, which would be possible if fuel levels were only subtracted once per frame. The wiring now allows rockets and fuel tanks to be connected programmatically; all hard coding has been removed. Engines currently can only use one fuel and draw from a single tank until more robust configuration is developed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
You can call me the white hat of the wiring system. I abuse the system horribly so we can find out how to stop people like me from breaking things.
The new
Pipewire type is, to cap's horror, just a wrapper for theActiveEntat the source end. Right now, this allows for connections between fuel tanks and engines to be programmatically defined in the ship blueprint (good). The MachineRocket at the sink end uses it (in Rocket.cpp:187) to reach into the source and withdraw whatever resources it demands (bad). The primary function of the pipe wire is to allow pipes to be defined in blueprints; we need to figure out what the interface presented to either end of the pipe should be.Right now, the pipes originate in MachineContainer, and are accepted as an argument by MachineRocket and stored as a member vector, and are iterated over in the main
MachineRocket::updateloop as before. Hopefully this new use case will help stimulate some brainstorming over how to improve the pipe system.