Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands
I have now removed all the temporary testing stuff, so the compiler warning and the "TransientCache: Dropping" output should be gone now. I have only commented out the log output in "graphic/text/transient_cache.h", so it can easily be activated again for further tweaking of the cache size. >From my testing, the current cache sizes allow for loading 22 maps in the map >selection screen before they start dropping entries. In-game dropping of >textures only started after quite a lot of text was generated by mousing over >things. Typing 500+ characters in a Multilineeditbox did not trigger texture >dropping. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands has been updated. Commit Message changed to: The new font renderer now creates a set of textures that will be blitted separately by the new class RenderedText. This avoids issues with texture sizes exceeding the maximum size supported by graphics drivers when MultilineTextareas get arbitrarily long. - Fixed positioning and scaling for census & statistics. - Removed size restriction from FullscreenMenuLoadGame::filename_list_string(). - Got rid of BiDi spaghetti code in Table and Listselect - As a side effect, this fixes the lag in Multilineeditbox with large texts and reduces the amount of needed cache memory. Also, refactored the following classes and functions: - text_height() - Tooltips - Game tips - TabPanel For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
I have just seen that the mentioned behavior (disappearing census and statistics) do also happen in current trunk when playing the seafaring tutorial. I check this in build 19... (must first compile from scratch) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
Sorry, wrong alert :S I accidentally edited the seafaring tutorial in trunk ... So trunk does NOT show this behavior. Seems i must limit the things i am working on... Sorry for the noise. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands
I got some compile warning we should not neglect: fh1-multitexture/src/graphic/text/transient_cache.h:48:2: warning: 'TransientCache' has virtual functions but non-virtual destructor [-Wnon-virtual-dtor] ~TransientCache(); in general when subclassing and using a parent pointer the correct Destructor will not be called. fh1-multitexture/src/logic/editor_game_base.h:39:1: warning: struct 'FullscreenMenuLaunchGame' was previously declared as a class [-Wmismatched-tags] struct FullscreenMenuLaunchGame; ^ fh1-multitexture/src/ui_fsmenu/launch_game.h:44:7: note: previous use is here class FullscreenMenuLaunchGame : public FullscreenMenuBase { fh1-multitexture/src/network/network.h:122:9: warning: struct 'Deserializer' was previously declared as a class [-Wmismatched-tags] friend struct Deserializer; ^ fh1-multitexture/src/network/network.h:36:7: note: previous use is here class Deserializer; Are there functions limited to float only? fh1-multitexture/src/logic/map_objects/map_object.cc:468:40: warning: implicit conversion increases floating-point precision: 'float' to 'double' [-Wdouble-promotion] scale = std::round(2 * (scale > 1.f ? std::sqrt(scale) : std::pow(scale, 2))) / 2; No idea about these, SirVer may tell us? fh1-multitexture/src/graphic/font_handler1.cc:90:48: warning: moving a temporary object prevents copy elision [-Wpessimizing-move] rendered_text = render_cache_->insert(hash, std::move(rt_renderer_->render(text, w))); ^ fh1-multitexture/src/graphic/font_handler1.cc:90:48: note: remove std::move call here rendered_text = render_cache_->insert(hash, std::move(rt_renderer_->render(text, w))); Sorry no time to check more code tonight, will just play that branch a bit -- https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands
Thanks for the review! I have hopefully fixed the compiler warnings now - we'll just have to wait what clang says. I also addressed your points from a few posts up and added some more documentation to the RendererText header file - I hope it will make the code a bit more clear. Yes, it's a bit complicated due to the cropping involved. 2 notes: 1. CropMode::kVertical doesn't exist because CropMode::kHorizontal was a stupid name. I went with kSelf now. Btter ideas are welcome :) 2. Re. better replace true / false by kBackGroundColorSet and !kBackGroundColorSet or such: While I generally prefer enum classes over bools myself, I think it would actually make the code harder to read in this instance, because there is no "else" branch when it is checked. This bool is only ever assigned in the private constructors, so it shouldn't cause any interface readability issues. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-multitexture into lp:widelands
> Do you have a chache hit ratio computed somewhere? No, I just used the log output to experiment a bit to find an acceptable value. Since we have 2 caches now, I made one really big while testing the other and vice versa. BTW the gametime being kicked out is perfectly OK, since it counts up, so the old gametime texture definitely isn't needed any more. The cache also bumps entries when they are accessed, so those textures that have gone the longest without being used are the first to be removed when it overflows. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-multitexture/+merge/323903 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-multitexture. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands
Continuous integration builds have changed state: Travis build 2241. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/235398138. Appveyor build 2076. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_net_boost_asio-2076. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/net-boost-asio into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands
Seems like its building on Windows (or at least on Appveyor) now. A confirmation and a short test would be appreciated, though. Also, building and testing on MacOS is still missing. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/net-boost-asio into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp