Add .life serialization support to lsns #652
Conversation
jacob1
changed the title
src/simulation/elements/LSNS.cpp
Outdated
| if (!r) | ||
| continue; | ||
|
|
||
| if (deserializelife && TYP(r) == PT_FILT) |
There was a problem hiding this comment.
This if statement is wrong, so is the next one. This one sets the .life of the LSNS, which isn't supposed to happen (that would cause the LSNS to generate a spark). It should set the .life of the non-FILT particle using this ctype calculation.
In addition, I think it would be a good idea to restrict it to newlife > 0. I don't want people setting negative life. (Also, please actually use newlife instead of duplicating the ctype check twice)
There was a problem hiding this comment.
I looked at it more, I didn't fully understand the problem before so my advice was wrong. The issue I have with this is the fact that there are two if statements and LSNS is modified. LSNS shouldn't be modified, and there should only be one if statement.
How it should work is, LSNS with .tmp = 2 scans around itself for a FILT. When it finds it, it then sets the .life of nearby particles. It should either: set the .life of the particle directly opposite the LSNS; or set the .life of all particles touching it. I don't really care which. Setting the .life of the opposite particle would be easier.
|
Made a few comments. I think using LSNS for both serialization and deserialization is a good idea, was going to suggest that :). Should hopefully be useful, allowing setting .life with LSNS. |
|
Thanks for pointing out these things, i will try to do suggested changes tomorrow. |
Prevent users from serializing negative .life values.
Remove unnecessary checks.
Allow LSNS to directly set nearby particle's life. Change tmp values for modes to maintain consistency among various sensors.
Remove unnecessary checks.
Fix deserialization not working in certain directions rewrite all the code to prevent conflicts. Fix invert mode not working under certain conditions.
| continue; | ||
| if (parts[ID(r)].life > parts[i].temp-273.15) | ||
| parts[i].life = 1; | ||
| if (parts[i].tmp == 1 && TYP(r) != PT_LSNS && TYP(r) != PT_FILT && parts[ID(r)].life >= 0) |
There was a problem hiding this comment.
Make decisions based on tmp with a switch? (case 1, case 2, case 3, default)
src/simulation/elements/LSNS.cpp
Outdated
| for (ry=-rd; ry<rd+1; ry++) | ||
| if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry)) | ||
| bool setFilt = false; | ||
| bool setFiltd = false; |
src/simulation/elements/LSNS.cpp
Outdated
| setFilt = true; | ||
| photonWl = parts[ID(r)].life; | ||
| } | ||
| if (parts[i].tmp == 3 && TYP(r) != PT_LSNS && TYP(r) == PT_FILT) |
There was a problem hiding this comment.
| if (parts[i].tmp == 3 && TYP(r) != PT_LSNS && TYP(r) == PT_FILT) | |
| if (parts[i].tmp == 3 && TYP(r) == PT_FILT) |
Add digitisation to LSNS