New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Truckparser - final edition #1137

Merged
merged 83 commits into from Oct 10, 2016

Conversation

Projects
None yet
3 participants
@only-a-ptr
Member

only-a-ptr commented Oct 5, 2016

Although it's not visible in the commit log (most bugfix commits were squashed...)

... the hero of bug-fixing is Ulteq 馃憦

This branch is almost ready for merge; some very minor glitches remain.

@ulteq

This comment has been minimized.

Show comment
Hide comment
@ulteq

This comment has been minimized.

Show comment
Hide comment
@ulteq

ulteq Oct 7, 2016

Contributor

The Piper J3 Super Cab segfaults in FinalizeRig() Fixed ~only_a_ptr

Contributor

ulteq commented Oct 7, 2016

The Piper J3 Super Cab segfaults in FinalizeRig() Fixed ~only_a_ptr

@ulteq

This comment has been minimized.

Show comment
Hide comment
@ulteq

ulteq Oct 7, 2016

Contributor

What about this one: #540

Contributor

ulteq commented Oct 7, 2016

What about this one: #540

@tritonas00

This comment has been minimized.

Show comment
Hide comment
@tritonas00

tritonas00 Oct 8, 2016

Collaborator

1db174c fixes Piper J3 segfault but breaks wings with other airplanes:
2016-10-08-140524_1366x768_scrot

log: http://pastebin.com/2BQW2cn7

Collaborator

tritonas00 commented Oct 8, 2016

1db174c fixes Piper J3 segfault but breaks wings with other airplanes:
2016-10-08-140524_1366x768_scrot

log: http://pastebin.com/2BQW2cn7

@ulteq

This comment has been minimized.

Show comment
Hide comment
@ulteq

ulteq Oct 8, 2016

Contributor

Dropping this commit: b3e7a2e should resolve the merge conflict.

I replaced the use-counter with a simple boolean flag: cd01068

Merge conflicts resolved: https://github.com/ulteq/rigs-of-rods/tree/only-a-ptr-truckparser-final

Contributor

ulteq commented Oct 8, 2016

Dropping this commit: b3e7a2e should resolve the merge conflict.

I replaced the use-counter with a simple boolean flag: cd01068

Merge conflicts resolved: https://github.com/ulteq/rigs-of-rods/tree/only-a-ptr-truckparser-final

wing_name << "wing-" << m_rig->truckname << "-" << m_rig->free_wing;
std::stringstream wing_obj_name;
wing_obj_name << "wingobj-" << m_rig->truckname << "-" << m_rig->free_wing;
if ((m_first_wing_index != -1) && (m_rig->wings[m_rig->free_wing - 1].fa == nullptr))

This comment has been minimized.

@ulteq

ulteq Oct 8, 2016

Contributor

Are you sure that m_rig->free_wing is always greater than zero?

@ulteq

ulteq Oct 8, 2016

Contributor

Are you sure that m_rig->free_wing is always greater than zero?

This comment has been minimized.

@only-a-ptr

only-a-ptr Oct 9, 2016

Member

Initial state is m_first_wing_index = -1; free_wing = 0;
If m_first_wing_index != -1, there must be at least 1 wing.

@only-a-ptr

only-a-ptr Oct 9, 2016

Member

Initial state is m_first_wing_index = -1; free_wing = 0;
If m_first_wing_index != -1, there must be at least 1 wing.

This comment has been minimized.

@ulteq

ulteq Oct 9, 2016

Contributor

Ok, let's just leave it like that.

@ulteq

ulteq Oct 9, 2016

Contributor

Ok, let's just leave it like that.

@ulteq

This comment has been minimized.

Show comment
Hide comment
@ulteq

ulteq Oct 8, 2016

Contributor

This should fix the wing issue: ulteq@03879cf

Contributor

ulteq commented Oct 8, 2016

This should fix the wing issue: ulteq@03879cf

@only-a-ptr

This comment has been minimized.

Show comment
Hide comment
@only-a-ptr

only-a-ptr Oct 9, 2016

Member

@tritonas00 I have absolutely no clue how could that have hapenned. I only reordered tasks regarding wing processing, which might have caused wings to stop working. But this... 馃槙

Member

only-a-ptr commented Oct 9, 2016

@tritonas00 I have absolutely no clue how could that have hapenned. I only reordered tasks regarding wing processing, which might have caused wings to stop working. But this... 馃槙

@tritonas00

This comment has been minimized.

Show comment
Hide comment
@tritonas00

tritonas00 Oct 9, 2016

Collaborator

ulteq@03879cf fixes the issue, i just tried it.

Collaborator

tritonas00 commented Oct 9, 2016

ulteq@03879cf fixes the issue, i just tried it.

only-a-ptr added some commits Jul 26, 2016

[codechange] Reorganized sources (rig def, physics IO)
Removed directory "physics/input_output"
    ForceFeedback moved under "utils"
    RigSpawner moved under "physics"

Directory "/source/rig_def_input_output" renamed to "/source/main/resources/rig_def_fileformat"
[Truck parser] Regex-free approach to parsing
File reading: Instead of std::string, static raw char* buffer is extracted from Ogre::DataStream
UTF-8 sanitization: instead of allocating new std::string, output is saved to static char* buffer

New parsing approach is proof-of concept only, used to handle sections `nodes` and `nodes2`.
- Tokenization: Instead of using a regex, a hand-made tokenizer is employed.
- Value parsing: Instead of Ogre::StringConverter, std::strtod() and std::strtol() are employed.
[Truck parser] regex-free `meshwheels` and `meshwheels2`
Removed struct `MeshWheel2`, using struct `MeshWheel` with flag `_is_meshwheel2`
[codechange] RigDef: simplified TC and ALB
TC = TractionControl
ALB = AntiLockBrakes

only-a-ptr and others added some commits Sep 15, 2016

[Fix] Always tokenize the current line
Fixes crash in ParseSetSkeletonSettings()
[Fix] RigSpawner: wing processing fault tolerance.
State checks and failure-prone actions are now performed first; then the wing is dry-constructed; then it's 'committed' to the rig.

Fixes a on-spawn segfault caused by wing counter being 1 larger than actual wing count.
[Feature] New 'wheeldetachers' section
Allows to disable the propulsion of detached wheels

Fixes: #920
@only-a-ptr

This comment has been minimized.

Show comment
Hide comment
@only-a-ptr

only-a-ptr Oct 10, 2016

Member

I cherry-picked all fixes from Ulteq's branch. Most got squashed into the original faulty commits.

Merging in 3... 2... 1...

Member

only-a-ptr commented Oct 10, 2016

I cherry-picked all fixes from Ulteq's branch. Most got squashed into the original faulty commits.

Merging in 3... 2... 1...

@only-a-ptr only-a-ptr merged commit e1fc2bf into RigsOfRods:master Oct 10, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@only-a-ptr only-a-ptr deleted the only-a-ptr:truckparser-final branch Oct 10, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment