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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfixes #453

Merged
merged 15 commits into from Dec 2, 2015

Conversation

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

only-a-ptr commented Nov 17, 2015

I'm on a fixing spree.
More to come...

only-a-ptr added some commits Nov 12, 2015

[fix] Building on Windows w/ Dependency-pack26
Backported to OGRE 1.8.1 found in Dep-pack26
    (previously ported to OGRE 1.9.0 by Skybon)
Should work with both versions (only 1.8.1 tested)
[fix] RoRBot's seating position in vehicle. Fixes #448
Issues:
* If multiple driver-seats were defined, spawner used the last one instead of the first one as required for compatibility.
* The code positioned RoRBot slightly left to compensate for old model's decentered origin. The new model is centered, so this hack was removed.
[fixes #419] Added option to keep 'static' camera when entering/exiti…
…ng vehicle.

Added options:
    Camera_EnterVehicle_KeepFixedFreeCam     | bool, default false
    Camera_ExitVehicle_KeepFixedFreeCam      | bool, default false

@only-a-ptr only-a-ptr added this to the 0.4.6.0 milestone Nov 17, 2015

@Hiradur

This comment has been minimized.

Show comment
Hide comment
@Hiradur

Hiradur Nov 17, 2015

Contributor

Apparently you built against an old version of MyGUI. You have to replace toValue() with getValue() in GUIInputManager.cpp

We upgraded to 3.2.2/latest git in:
591474d

Contributor

Hiradur commented Nov 17, 2015

Apparently you built against an old version of MyGUI. You have to replace toValue() with getValue() in GUIInputManager.cpp

We upgraded to 3.2.2/latest git in:
591474d

@only-a-ptr

This comment has been minimized.

Show comment
Hide comment
@only-a-ptr

only-a-ptr Nov 17, 2015

Member

@Hiradur I'm building against RoR-Deps26 as-is. I didn't notice we partially obsoleted it.

Do we have updated build instructions? TBH I lost track of our developer resources. What version of OGRE are we building against in upstream?

EDIT: Anyway, this should do it:
https://github.com/MyGUI/mygui/blob/master/MyGUIEngine/include/MyGUI_Prerequest.h#L78

#if MYGUI_VERSION >= 0x030202
#   define MYGUI_GET_SCANCODE(KEY) (KEY.getValue())
#else
#   define MYGUI_GET_SCANCODE(KEY) (KEY.toValue())
#endif
Member

only-a-ptr commented Nov 17, 2015

@Hiradur I'm building against RoR-Deps26 as-is. I didn't notice we partially obsoleted it.

Do we have updated build instructions? TBH I lost track of our developer resources. What version of OGRE are we building against in upstream?

EDIT: Anyway, this should do it:
https://github.com/MyGUI/mygui/blob/master/MyGUIEngine/include/MyGUI_Prerequest.h#L78

#if MYGUI_VERSION >= 0x030202
#   define MYGUI_GET_SCANCODE(KEY) (KEY.getValue())
#else
#   define MYGUI_GET_SCANCODE(KEY) (KEY.toValue())
#endif
@Hiradur

This comment has been minimized.

Show comment
Hide comment
@Hiradur

Hiradur Nov 17, 2015

Contributor

There are no up to date instructions for Windows. You can see the required versions of libraries here: http://www.rigsofrods.com/wiki/pages/Compiling_Sources_under_Linux#Library_and_Software_versions_required_to_compile_Rigs_of_Rods

I think @Max98 wanted to upload a new Windows dep archive.

current errors:

�[0m[100%] �[32mBuilding CXX object source/main/main_sim/CMakeFiles/RoR.dir/MainThread.cpp.o
�[0m/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:113:21: error: #if with no expression
 #if ROR_USE_OGRE_1_9

                     ^
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:131:21: error: #if with no expression
 #if ROR_USE_OGRE_1_9

                     ^
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp: In member function ‘void RoR::MainThread::Go()’:
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:650:9: error: ‘overlay_system’ was not declared in this scope
  delete overlay_system;

         ^
make[2]: *** [source/main/main_sim/CMakeFiles/RoR.dir/MainThread.cpp.o] Error 1

Sorry, but Travis screws up the characters for some reason

For the first one: You should use #ifdef ROR_USE_OGRE_1_9
For overlay_system: should be fixed when the first one is fixed

Contributor

Hiradur commented Nov 17, 2015

There are no up to date instructions for Windows. You can see the required versions of libraries here: http://www.rigsofrods.com/wiki/pages/Compiling_Sources_under_Linux#Library_and_Software_versions_required_to_compile_Rigs_of_Rods

I think @Max98 wanted to upload a new Windows dep archive.

current errors:

�[0m[100%] �[32mBuilding CXX object source/main/main_sim/CMakeFiles/RoR.dir/MainThread.cpp.o
�[0m/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:113:21: error: #if with no expression
 #if ROR_USE_OGRE_1_9

                     ^
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:131:21: error: #if with no expression
 #if ROR_USE_OGRE_1_9

                     ^
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp: In member function ‘void RoR::MainThread::Go()’:
/home/travis/build/RigsOfRods/rigs-of-rods/source/main/main_sim/MainThread.cpp:650:9: error: ‘overlay_system’ was not declared in this scope
  delete overlay_system;

         ^
make[2]: *** [source/main/main_sim/CMakeFiles/RoR.dir/MainThread.cpp.o] Error 1

Sorry, but Travis screws up the characters for some reason

For the first one: You should use #ifdef ROR_USE_OGRE_1_9
For overlay_system: should be fixed when the first one is fixed

@Hiradur

This comment has been minimized.

Show comment
Hide comment
@Hiradur

Hiradur Nov 18, 2015

For things like this a // TODO would be nice so it doesn't get lost

For things like this a // TODO would be nice so it doesn't get lost

@Hiradur

This comment has been minimized.

Show comment
Hide comment
@Hiradur

Hiradur Nov 18, 2015

Contributor

Looks good, do you want to merge it now or add more fixes?

Contributor

Hiradur commented Nov 18, 2015

Looks good, do you want to merge it now or add more fixes?

[fix #435] Terrains using managed_mats.material work again.
The problem was cache regen: ManagedMaterial resources were not loaded during cache regen and OGRE resource system threw Exceptions due to unresolved material links.
Quick solution: Init ManagedMaterials before regening cache!
@only-a-ptr

This comment has been minimized.

Show comment
Hide comment
@only-a-ptr

only-a-ptr Nov 19, 2015

Member

@Hiradur I'll definitely fix some more. There are them high-priority :)

Member

only-a-ptr commented Nov 19, 2015

@Hiradur I'll definitely fix some more. There are them high-priority :)

[codechange] ContentManager: Added TODO label
// Removed by Skybon as part of OGRE 1.9 port
// Disabling temporarily for 1.8.1 as well. ~ only_a_ptr, 2015-11
// TODO: Study the system, then re-enable or remove entirely.
//#include "OgreBoxEmitterFactory.h"
@only-a-ptr

This comment has been minimized.

Show comment
Hide comment
@only-a-ptr

only-a-ptr Dec 2, 2015

Member

@Hiradur I've paused the bugfixing due to my Lua-Powertrain project. Feel free to merge this.

Member

only-a-ptr commented Dec 2, 2015

@Hiradur I've paused the bugfixing due to my Lua-Powertrain project. Feel free to merge this.

Hiradur added a commit that referenced this pull request Dec 2, 2015

@Hiradur Hiradur merged commit f03531f into RigsOfRods:master Dec 2, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment