Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/multiline_textarea into lp:widelands
There was one remaining instance of that bug for Gaelic language only in the options window, which has now disappeared. The reason for this is to speed up rendering - you should notice that map descriptions now load faster again. @wl-zocker: it is "translatable" in the sense that you use it to pick your font set - instructions are on Transifex, but nobody seems to read them. Unfortunately, it is not possible to add comments to JSON files. -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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/opengl_debug into lp:widelands
I did not succeed in compiling the glbindings library for now. It does seem to depend on posix threads and does not detect the correct version on my system with mingw-w64. But i'll continue to try... I've created a github branch for this branch with a changed appveyor.yml wich enables glbinding: https://ci.appveyor.com/project/widelands-dev/widelands/build/opengl_binding-290 Let's wait if appveyor does manage to build it at some point without a timeout... -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/opengl_debug into lp:widelands
Continuous integration builds have changed state: Travis build 382. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104561461. Appveyor build 289. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_opengl_debug-289. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/bug-1397500 into lp:widelands
Review: Needs Fixing Let's get this branch in before it starts to smell from sitting around too long :) I think it is a good improvement, making data/ the only directory that we need to install. However there are a couple of things that need fixing: - this fails to compile on gcc 4.7 (see travis link) - this needs fixes to the texture atlas generation in graphics. The atlas must contain at least roads & textures and ideally as many of the often used UI graphics as possible. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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/multiline_textarea into lp:widelands
Is this supposed to fix the bug-1532279 - because it is linked here but marked as fix committed. Anyway, the bug is no longer here and code looks good to me. -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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/opengl_debug into lp:widelands
@SirVer, Please ignore my comment, it belongs to other merge request... -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/iso_date_image_options into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/iso_date_image_options into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/iso_date_image_options/+merge/282653 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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-website/iso_date_image_options into lp:widelands-website
Review: Approve Thanks! Deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/iso_date_image_options/+merge/282653 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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/opengl_debug into lp:widelands
> The problem is gone. The code also LGTM. Tibor, Which problem are you referring to? > [ 11%] Building CXX object > src/graphic/CMakeFiles/graphic_gl_utils.dir/gl/initialize.cc.o ... I used a older version of glbinding, apparently they changed the interface. I updated to 1.1.0 and got the same error. Fixed now. > Is this branch to find the problems I encounter? There are 3 lurking issues with OpenGL right now: bug 1536377, bug 1535732 and a dynamic drawing problem that was reported on Facebook: http://www.youtube.com/watch?v=v8JG1qjZQ9o. I hope this branch gets us closer to fixing all of them. > If so, will there be an appveyor build of this branch that will be built with > the needed parameters? That is the intention. Tino managed to build this branch on his local machine already and he was trying to make it work on appveyor too. The debug code will also be in release builds, so a build from appveyor will have it. We should also switch our PPA away from glew and to glbinding, IMHO. It is a much superior gl loader. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/opengl_debug into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/opengl_debug into lp:widelands has been updated. Commit Message changed to: - Fixes a bug: We never created zero sized textures, but sometimes we tried to render on them. This is uncritical, theoretically, but I fixed it anyways. - Added a new undocumented command line argument --debug_gl_trace which will log every OpenGL call that is made, together with arguments, return values and glError status. This requires that Widelands is build using -DOPTION_USE_GLBINDING:BOOL=ON. It is a NoOp for GLEW. This will help debugging non-reproducible OpenGL errors that are reported. Tested with glbinding 1.1.0. - More logging when OpenGL is initialized. - Pulls out OpenGL initialization into a separate unit. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-wui into lp:widelands
Continuous integration builds have changed state: Travis build 381. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/104490091. Appveyor build 288. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_klaus_halfmann_widelands_bug_1395278_wui-288. -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-wui/+merge/283747 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-wui 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/opengl_debug into lp:widelands
Continuous integration builds have changed state: Travis build 377. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104463853. Appveyor build 284. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_opengl_debug-284. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-wui into lp:widelands
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~klaus-halfmann/widelands/bug-1395278-wui mirrored to https://github.com/widelands/widelands/tree/_klaus_halfmann_widelands_bug_1395278_wui You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-wui/+merge/283747 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-wui 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/opengl_debug into lp:widelands
The problem is gone. The code also LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
Is this branch to find the problems I encounter? If so, will there be an appveyor build of this branch that will be built with the needed parameters? (I have no building environment on Windows.) -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/multiline_textarea into lp:widelands
Does this "default" has to be translatable at all? I had also translated it to German (it's fixed). -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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/opengl_debug into lp:widelands
OK, next problem:
bratzbert@museum:~/sources/widelands/opengl_debug$ cd build
bratzbert@museum:~/sources/widelands/opengl_debug/build$ cmake
-DOPTION_USE_GLBINDING:BOOL=ON -DCMAKE_BUILD_TYPE:STRING="Debug" .
-- Boost version: 1.54.0
-- Found the following Boost libraries:
-- unit_test_framework
-- regex
-- SDL2_INCLUDE_DIR is /usr/include/SDL2
-- SDL2MAIN_LIBRARY is /usr/lib/x86_64-linux-gnu/libSDL2main.a
-- Found GLBINDING: /usr/local/lib/libglbinding.so
-- Version of Widelands Build is bzr7737[opengl_debug](Debug)
-- Found Doxygen: /usr/bin/doxygen (found version "1.8.6")
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/bratzbert/sources/widelands/opengl_debug/build
bratzbert@museum:~/sources/widelands/opengl_debug/build$ make
Scanning dependencies of target BzrRevision
-- Version of Widelands Build is bzr7737[opengl_debug](Debug)
[ 0%] Built target BzrRevision
Scanning dependencies of target third_party_eris
[ 11%] Building CXX object
src/graphic/CMakeFiles/graphic_gl_utils.dir/gl/initialize.cc.o
/home/bratzbert/sources/widelands/opengl_debug/src/graphic/gl/initialize.cc: In
lambda function:
/home/bratzbert/sources/widelands/opengl_debug/src/graphic/gl/initialize.cc:62:29:
error: request for member ‘name’ in ‘call.glbinding::FunctionCall::function’,
which is of pointer type ‘const glbinding::AbstractFunction* const’ (maybe you
meant to use ‘->’ ?)
log("%s(", call.function.name());
^
make[2]: *** [src/graphic/CMakeFiles/graphic_gl_utils.dir/gl/initialize.cc.o]
Error 1
make[1]: *** [src/graphic/CMakeFiles/graphic_gl_utils.dir/all] Error 2
make: *** [all] Error 2
--
https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
Duh, I need to install glbinding first... compiling now. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:widelands
Continuous integration builds have changed state: Travis build 379. State: canceled. Details: https://travis-ci.org/widelands/widelands/builds/104469110. Appveyor build 286. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_copyright_file-286. -- https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/283575 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/copyright-file 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/opengl_debug into lp:widelands
My fault, I passed --debug_gl_trace instead of --debug_gl_trace=yes My system can't handle ninja, so I tried now: mkdir build cd build cmake -DOPTION_USE_GLBINDING:BOOL=ON -DCMAKE_BUILD_TYPE:STRING="Debug" .. Which gives me: CMake Error at CMakeLists.txt:60 (find_package): By not providing "Findglbinding.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "glbinding", but CMake did not find one. Could not find a package configuration file provided by "glbinding" with any of the following names: glbindingConfig.cmake glbinding-config.cmake Add the installation prefix of "glbinding" to CMAKE_PREFIX_PATH or set "glbinding_DIR" to a directory containing one of the above files. If "glbinding" provides a separate development package or SDK, be sure it has been installed. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
> [] > [/home/bratzbert/sources/widelands/opengl_debug/src/profile/profile.cc:167] > debug_gl_trace: '' is not a boolean value Seems like you have it already set in your ~/.widelands/config? strange. > is the switch in CMake set? No, we default to using GLEW for compilation since it is mature and packaged and available. You need to set the flag yourself and install glbinding[1] to test this. cmake -G Ninja -DOPTION_USE_GLBINDING:BOOL=ON -DCMAKE_BUILD_TYPE:STRING="Debug" .. should do the trick. [1] https://github.com/cginternals/glbinding -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
Here's my output - it complains about "debug_gl_trace" not being Boolean, both before and after the commit regarding trace. I simply called ./compile.sh for the compilation, is the switch in CMake set? [] [/home/bratzbert/sources/widelands/opengl_debug/src/profile/profile.cc:167] debug_gl_trace: '' is not a boolean value Graphics: Try to set Videomode 800x600 Graphics: OpenGL: Version "2.1 Mesa 10.1.3" Graphics: SDL_GL_RED_SIZE is 8 Graphics: SDL_GL_GREEN_SIZE is 8 Graphics: SDL_GL_BLUE_SIZE is 8 Graphics: SDL_GL_ALPHA_SIZE is 8 Graphics: SDL_GL_BUFFER_SIZE is 32 Graphics: SDL_GL_DOUBLEBUFFER is 1 Graphics: SDL_GL_DEPTH_SIZE is 24 Graphics: SDL_GL_STENCIL_SIZE is 8 Graphics: SDL_GL_ACCUM_RED_SIZE is 0 Graphics: SDL_GL_ACCUM_GREEN_SIZE is 0 Graphics: SDL_GL_ACCUM_BLUE_SIZE is 0 Graphics: SDL_GL_ACCUM_ALPHA_SIZE is 0 Graphics: SDL_GL_STEREO is 0 Graphics: SDL_GL_MULTISAMPLEBUFFERS is 0 Graphics: SDL_GL_MULTISAMPLESAMPLES is 0 Graphics: SDL_GL_ACCELERATED_VISUAL is 1 Graphics: SDL_GL_CONTEXT_MAJOR_VERSION is 2 Graphics: SDL_GL_CONTEXT_MINOR_VERSION is 1 Graphics: SDL_GL_CONTEXT_FLAGS is 0 Graphics: SDL_GL_CONTEXT_PROFILE_MASK is 2 Graphics: SDL_GL_SHARE_WITH_CURRENT_CONTEXT is 0 Graphics: SDL_GL_FRAMEBUFFER_SRGB_CAPABLE is 0 Graphics: OpenGL: Double buffering enabled Graphics: OpenGL: Max texture size: 8192 Graphics: OpenGL: ShadingLanguage: "1.20" GRAPHICS REPORT VIDEO DRIVER x11 pixel fmt 370546692 size 800 600 END GRAPHICS REPORT -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/copyright-file into lp:widelands
I gave all of the TODOs a shot - all licenses in questions are BSD-ish, so I feel that even if we did not get it completely right, it should not be the end of the world. PTAL. Diff comments: > > === added file 'debian/copyright.todo' > --- debian/copyright.todo 1970-01-01 00:00:00 + > +++ debian/copyright.todo 2016-01-22 18:35:40 + > @@ -0,0 +1,34 @@ > +Documents known missing entries in the copyright file > + > +src/thirdparty/minizip/* > +We've shipped this for a while, only the fonts below are new. > +According to the readme it originates from zlib's minizip example, though has > +been modified in Widelands, so we may want to document this, including our > +changes. What's best practice here, mark it based on the original license and > +then mention any modifications done by the Widelands team? > + > +i18n/fonts/DejaVu/* > +Our bundled version mentions something about glyphs which I can't find at > +https://tracker.debian.org/pkg/fonts-dejavu. I assumed we could follow the > +example from that package on how to document these fonts, but I don't know if > +the glyphs doesn't need a specific mentioning or whether the Debian package > has > +stripped them out. Anyone know? > + > +i18n/fonts/FaKacstBook/* okay. done > +Presumably GPLed, but doesn't detail which version nor the copyright holder. > +The Launchpad site says GPL v2, but the tar.gz doesn't include a license > file. > + > +i18n/fonts/MicroHei/* > +"This font is licensed under Apache2.0 or GPLv3 > + with font embedding exceptions (see Appendix B)." > +Don't know how we deal with dual-licensing in this context. Do we pick one, > or > +should both be listed? > + > +i18n/fonts/*mmrCensus* > +Open Font License. Again we may need some name(s). > +>I found their project homepage: https://code.google.com/p/myanmar3source/ > +Now I'm confused. The project page mentions the following: > +Code license > +GNU Lesser GPL > +Content license > +Creative Commons 3.0 BY -- https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/283575 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/copyright-file 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/find_attack_soldiers into lp:widelands
I do not feel like going over this and clean it up. I do not understand most of the intentions. Martin, are you still interested to work on this? Otherwise I will drop this branch in a few days. -- https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/find_attack_soldiers. ___ 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/ai_ship_tweaks into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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/ai_ship_tweaks into lp:widelands
OK, next try @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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/opengl_debug into lp:widelands
fixed the unused variable. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
Compiler warning:
[ 11%] Building CXX object
src/graphic/CMakeFiles/graphic_gl_utils.dir/gl/initialize.cc.o
/home/bratzbert/sources/widelands/opengl_debug/src/graphic/gl/initialize.cc:32:1:
warning: unused parameter ‘trace’ [-Wunused-parameter]
initialize(const Trace& trace, SDL_Window* sdl_window, GLint*
max_texture_size) {
^
--
https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
Adresed all comments and copied an explanative text into initialize.cc
Diff comments:
>
> === added file 'src/graphic/gl/initialize.h'
> --- src/graphic/gl/initialize.h 1970-01-01 00:00:00 +
> +++ src/graphic/gl/initialize.h 2016-01-24 12:46:35 +
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright (C) 2006-2016 by the Widelands Development Team
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + */
> +
> +#ifndef WL_GRAPHIC_GL_INITIALIZE_H
> +#define WL_GRAPHIC_GL_INITIALIZE_H
> +
> +#include
> +
> +#include "graphic/gl/system_headers.h"
> +
> +namespace Gl {
> +
> +// Initializes OpenGL. Creates a context for 'window' using SDL and loads the
> +// GL library. Fills in 'max_texture_size' and returns the created
> SDL_Context
> +// which must be closed by the caller.
> +// If we are build against glbinding, 'trace' will set up tracing for
done.
> +// OpenGL and output every single opengl call ever made, together with it's
> +// arguments, return values and the result from glGetError.
> +enum class Trace {
> + kYes,
> + kNo,
> +};
> +SDL_GLContext
> +initialize(const Trace& trace, SDL_Window* window, GLint* max_texture_size);
> +
> +} // namespace Gl
> +
> +#endif // end of include guard: WL_GRAPHIC_GL_INITIALIZE_H
>
> === modified file 'src/graphic/texture.cc'
> --- src/graphic/texture.cc2016-01-13 07:27:55 +
> +++ src/graphic/texture.cc2016-01-24 12:46:35 +
> @@ -187,7 +188,7 @@
> w, h,
> Rect(0, 0, w, h),
> };
> - if (width() <= 0 || height() <= 0) {
> + if (w * h == 0) {
at this point texture_id is always = 0. It is only initialized a few lines
further down, so this is the gate keeper if it should be set to != 0.
> return;
> }
>
--
https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/opengl_debug 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/opengl_debug into lp:widelands
This is what i get with this branch: Set home directory: /home/kaputtnik/.widelands Widelands executable directory: /home/kaputtnik/widelands-repo/opengl_debug/ Adding directory: /home/kaputtnik/widelands-repo/opengl_debug/. selected language: (system language) using locale de_DE.UTF-8 Graphics: Try to set Videomode 800x600 Graphics: OpenGL: Version "3.0 Mesa 11.1.1" Graphics: SDL_GL_RED_SIZE is 8 Graphics: SDL_GL_GREEN_SIZE is 8 Graphics: SDL_GL_BLUE_SIZE is 8 Graphics: SDL_GL_ALPHA_SIZE is 0 Graphics: SDL_GL_BUFFER_SIZE is 24 Graphics: SDL_GL_DOUBLEBUFFER is 1 Graphics: SDL_GL_DEPTH_SIZE is 24 Graphics: SDL_GL_STENCIL_SIZE is 8 Graphics: SDL_GL_ACCUM_RED_SIZE is 0 Graphics: SDL_GL_ACCUM_GREEN_SIZE is 0 Graphics: SDL_GL_ACCUM_BLUE_SIZE is 0 Graphics: SDL_GL_ACCUM_ALPHA_SIZE is 0 Graphics: SDL_GL_STEREO is 0 Graphics: SDL_GL_MULTISAMPLEBUFFERS is 0 Graphics: SDL_GL_MULTISAMPLESAMPLES is 0 Graphics: SDL_GL_ACCELERATED_VISUAL is 1 Graphics: SDL_GL_CONTEXT_MAJOR_VERSION is 2 Graphics: SDL_GL_CONTEXT_MINOR_VERSION is 1 Graphics: SDL_GL_CONTEXT_FLAGS is 0 Graphics: SDL_GL_CONTEXT_PROFILE_MASK is 2 Graphics: SDL_GL_SHARE_WITH_CURRENT_CONTEXT is 0 Graphics: SDL_GL_FRAMEBUFFER_SRGB_CAPABLE is 0 Graphics: OpenGL: Double buffering enabled Graphics: OpenGL: Max texture size: 8192 Graphics: OpenGL: ShadingLanguage: "1.30" GRAPHICS REPORT VIDEO DRIVER x11 pixel fmt 370546692 size 800 600 END GRAPHICS REPORT -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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/multiline_textarea into lp:widelands
"défaut" is a screwup by a French translator and I have already fixed it on Transifex. I know that the scrollbar shows up when the font size is bigger sometimes, this is expected behaviour and not related to this branch. All the screens that show this need to be switched over to Box layout. This will mean a lot of code, so I am planning to fix this up for build 20. We need the bigger font size though, because some fonts show up so small that they are unreadable. -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/multiline_textarea into lp:widelands
Continuous integration builds have changed state: Travis build 371. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104411863. Appveyor build 278. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_multiline_textarea-278. -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_hotspot_barbarian_brewer/+merge/283739 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer. ___ 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/opengl_debug into lp:widelands
Not compiled or tested yet, but code LGTM - just 2 nits.
I think the option and build requirement should be documented somewhere in the
code, because we won't find it in this commit message down the road. I think
copying the commit message to src/graphic/gl/initialize.cc should be enough for
now.
Diff comments:
>
> === added file 'src/graphic/gl/initialize.h'
> --- src/graphic/gl/initialize.h 1970-01-01 00:00:00 +
> +++ src/graphic/gl/initialize.h 2016-01-24 12:46:35 +
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright (C) 2006-2016 by the Widelands Development Team
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + */
> +
> +#ifndef WL_GRAPHIC_GL_INITIALIZE_H
> +#define WL_GRAPHIC_GL_INITIALIZE_H
> +
> +#include
> +
> +#include "graphic/gl/system_headers.h"
> +
> +namespace Gl {
> +
> +// Initializes OpenGL. Creates a context for 'window' using SDL and loads the
> +// GL library. Fills in 'max_texture_size' and returns the created
> SDL_Context
> +// which must be closed by the caller.
> +// If we are build against glbinding, 'trace' will set up tracing for
If we are buil*t*
> +// OpenGL and output every single opengl call ever made, together with it's
> +// arguments, return values and the result from glGetError.
> +enum class Trace {
> + kYes,
> + kNo,
> +};
> +SDL_GLContext
> +initialize(const Trace& trace, SDL_Window* window, GLint* max_texture_size);
> +
> +} // namespace Gl
> +
> +#endif // end of include guard: WL_GRAPHIC_GL_INITIALIZE_H
>
> === modified file 'src/graphic/texture.cc'
> --- src/graphic/texture.cc2016-01-13 07:27:55 +
> +++ src/graphic/texture.cc2016-01-24 12:46:35 +
> @@ -187,7 +188,7 @@
> w, h,
> Rect(0, 0, w, h),
> };
> - if (width() <= 0 || height() <= 0) {
> + if (w * h == 0) {
The other conditions have:
if (m_blit_data.texture_id == 0) {
Is there a specific reason that there are 2 different conditions?
> return;
> }
>
--
https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/opengl_debug 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/fix_hotspot_barbarian_brewer into lp:widelands
Review: Approve Keen eyes :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_hotspot_barbarian_brewer/+merge/283739 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer. ___ 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/multiline_textarea into lp:widelands
Don't know if this is related to richtext, but some fonts are displayed bigger than other fonts. In result the scrollbar button is shown when the font size is bigger. This applies to most RTL languages. There are several failures in console like: No corresponding locale found - trying to set it via LANGUAGE=si, LANG=si Font set 'défaut' for locale 'fr' does not exist; using default instead. Font set 'défaut' for locale 'fr' does not exist; using default instead. Don't know Language "si" locale "fr" but with this settings most strings are empty (f.e. no button labels anymore). I am wondering also about the spelling of the word 'défaut'... the circumflex on the e and missing 'l'. I think this should be 'default' instead of 'défaut'? -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:widelands
Continuous integration builds have changed state: Travis build 368. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104407410. Appveyor build 275. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_copyright_file-275. -- https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/283575 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/copyright-file 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_ship_tweaks into lp:widelands
Bunnybot encountered an error while working on this merge proposal: 'Branch' object has no attribute 'appveyor' -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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/fix_hotspot_barbarian_brewer into lp:widelands
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_fix_hotspot_barbarian_brewer You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/fix_hotspot_barbarian_brewer/+merge/283739 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer into lp:widelands
kaputtnik has proposed merging
lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer into lp:widelands.
Commit message:
Fixed hotspot for babarian brewer walk animation.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_hotspot_barbarian_brewer/+merge/283739
Fixed hotspot for babarian brewer walk animation.
For comparison:
http://bazaar.launchpad.net/~widelands-dev/widelands/build-18/view/head:/tribes/barbarians/brewer/conf
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_hotspot_barbarian_brewer into lp:widelands.
=== modified file 'tribes/workers/barbarians/brewer/init.lua'
--- tribes/workers/barbarians/brewer/init.lua 2015-12-11 16:54:00 +
+++ tribes/workers/barbarians/brewer/init.lua 2016-01-24 13:45:22 +
@@ -6,7 +6,7 @@
hotspot = { 7, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {23, 23}, 10)
+add_worker_animations(animations, "walk", dirname, "walk", {12, 23}, 10)
add_worker_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
___
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/memory_leak into lp:widelands
> So the increases you see are probably just due to map objects being created. Yes that is probably be the reason. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/opengl_debug mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_opengl_debug You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/opengl_debug into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/opengl_debug into
lp:widelands.
Commit message:
- Fixes a bug: We never created zero sized textures, but sometimes we tried to
render on them. This is uncritical, theoretically, but I fixed it anyways.
- Added a new undocumented command line argument --debug_gl_trace which will
log every OpenGL call that is made, together with arguments, return values and
glError status. This requires that Widelands is build using
-DOPTION_USE_GLBINDING:BOOL=ON. It is a NoOp for GLEW. This will help debugging
non-reproducible OpenGL errors that are reported.
- More logging when OpenGL is initialized.
- Pulls out OpenGL initialization into a separate unit.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738
Small bug fixes and better debug potential for OpenGL - but only if glbinding
is used.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/opengl_debug into lp:widelands.
=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt 2016-01-19 07:33:34 +
+++ src/graphic/CMakeLists.txt 2016-01-24 12:46:35 +
@@ -87,6 +87,8 @@
SRCS
gl/blit_data.h
gl/coordinate_conversion.h
+gl/initialize.cc
+gl/initialize.h
gl/system_headers.h
gl/utils.cc
gl/utils.h
=== added file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc 1970-01-01 00:00:00 +
+++ src/graphic/gl/initialize.cc 2016-01-24 12:46:35 +
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2006-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "graphic/gl/initialize.h"
+
+#include
+
+#include
+
+#include "base/macros.h"
+#include "graphic/gl/utils.h"
+
+namespace Gl {
+
+SDL_GLContext
+initialize(const Trace& trace, SDL_Window* sdl_window, GLint* max_texture_size) {
+ // Request an OpenGL 2 context with double buffering.
+ SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+ SDL_GLContext gl_context = SDL_GL_CreateContext(sdl_window);
+ SDL_GL_MakeCurrent(sdl_window, gl_context);
+
+#ifdef USE_GLBINDING
+ glbinding::Binding::initialize();
+
+ if (trace == Trace::kYes) {
+ setCallbackMaskExcept(
+glbinding::CallbackMask::After | glbinding::CallbackMask::ParametersAndReturnValue,
+{"glGetError"});
+ glbinding::setAfterCallback([](const glbinding::FunctionCall& call) {
+ log("%s(", call.function.name());
+ for (size_t i = 0; i < call.parameters.size(); ++i) {
+log("%s", call.parameters[i]->asString().c_str());
+if (i < call.parameters.size() - 1)
+ log(", ");
+ }
+ log(")");
+ if (call.returnValue) {
+log(" -> %s", call.returnValue->asString().c_str());
+ }
+ const auto error = glGetError();
+ log(" [%s]\n", gl_error_to_string(error));
+ // The next few lines will terminate Widelands if there was any OpenGL
+ // error. This is useful for super aggressive debugging, but probably
+ // not for regular builds. Comment it in if you need to understand
+ // OpenGL problems.
+ // if (error != GL_NO_ERROR) {
+ // std::raise(SIGINT);
+ // }
+ });
+ }
+#else
+ // See graphic/gl/system_headers.h for an explanation of the next line.
+ glewExperimental = GL_TRUE;
+ GLenum err = glewInit();
+ if (err != GLEW_OK) {
+ log("glewInit returns %i\nYour OpenGL installation must be __very__ broken. %s\n", err,
+ glewGetErrorString(err));
+ throw wexception("glewInit returns %i: Broken OpenGL installation.", err);
+ }
+#endif
+
+ log(
+ "Graphics: OpenGL: Version \"%s\"\n", reinterpret_cast(glGetString(GL_VERSION)));
+
+#define LOG_SDL_GL_ATTRIBUTE(x)\
+ { \
+ int value; \
+ SDL_GL_GetAtt
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/memory_leak into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/memory_leak into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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/memory_leak into lp:widelands
Oh, gun already reviewed the code. did not see that. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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/memory_leak into lp:widelands
Widelands is currently not leaking memory during normal gameplay. I checked that yesterday. So the increases you see are probably just due to map objects being created. I'd still like a code review if possible. > Am 24.01.2016 um 11:27 schrieb kaputtnik : > > To fiddle out why the memory increases will take some time. So we could merge > this and i open a new bug if i found the something. > > > -- > https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 > You proposed lp:~widelands-dev/widelands/memory_leak for merging. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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/memory_leak into lp:widelands
To fiddle out why the memory increases will take some time. So we could merge this and i open a new bug if i found the something. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/multiline_textarea mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_multiline_textarea You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/multiline_textarea 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/multiline_textarea into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/multiline_textarea
into lp:widelands.
Commit message:
MultilineTextarea now uses the new font renderer directly instead of WordWrap.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1532279 in widelands: "Spin box not displayed correct in options menu"
https://bugs.launchpad.net/widelands/+bug/1532279
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/multiline_textarea/+merge/283736
MultilineTextarea now uses the new font renderer directly instead of WordWrap.
Removed the Impl pattern, but we still need to use Richtext, because the new
font handler still has some bugs with richtext strings.
This also fixes the remaining superfluous scrollbar button with Gaelic
Spinboxes in the Options window.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/multiline_textarea into lp:widelands.
=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc 2016-01-18 19:35:25 +
+++ src/graphic/text/rt_render.cc 2016-01-24 09:24:17 +
@@ -824,11 +824,11 @@
if (a.has("align")) {
const std::string align = a["align"].get_string();
if (align == "right") {
+m_ns.halign = UI::Align::Align_Right;
+ } else if (align == "center" || align == "middle") {
+m_ns.halign = UI::Align::Align_Center;
+ } else {
m_ns.halign = UI::Align::Align_Left;
- } else if (align == "center" || align == "middle") {
-m_ns.halign = UI::Align::Align_Center;
- } else {
-m_ns.halign = UI::Align::Align_Right;
}
}
m_ns.halign = mirror_alignment(m_ns.halign);
=== modified file 'src/graphic/text_constants.h'
--- src/graphic/text_constants.h 2015-05-30 12:19:57 +
+++ src/graphic/text_constants.h 2016-01-24 09:24:17 +
@@ -24,7 +24,6 @@
/// Font Sizes
#define UI_FONT_SIZE_BIG22
-#define UI_FONT_SIZE_PROSA 18
#define UI_FONT_SIZE_SMALL 14
#define UI_FONT_SIZE_ULTRASMALL 10
@@ -35,9 +34,6 @@
#define UI_FONT_CLR_DISABLED RGBColor(127, 127, 127)
#define UI_FONT_CLR_WARNING RGBColor(255, 22, 22)
-/// Prosa font color
-#define PROSA_FONT_CLR_FGRGBColor(255, 255, 0)
-
/// Tooltip font color
#define UI_FONT_TOOLTIP_CLR RGBColor(255, 255, 0)
=== modified file 'src/graphic/text_layout.cc'
--- src/graphic/text_layout.cc 2015-12-13 18:32:28 +
+++ src/graphic/text_layout.cc 2016-01-24 09:24:17 +
@@ -54,12 +54,24 @@
f % txt;
return f.str();
}
+
std::string as_uifont(const std::string & txt, int size, const RGBColor& clr) {
+ return as_aligned(txt, UI::Align::Align_Left, size, clr);
+}
+
+std::string as_aligned(const std::string & txt, UI::Align align, int ptsize, const RGBColor& clr) {
+ std::string alignment = "left";
+ if ((align & UI::Align_Horizontal) == UI::Align::Align_Right) {
+ alignment = "right";
+ } else if ((align & UI::Align_Horizontal) == UI::Align::Align_HCenter) {
+ alignment = "center";
+ }
+
// UI Text is always bold due to historic reasons
static boost::format
- f("%s");
-
- f % size;
+ f("%s");
+ f % alignment;
+ f % ptsize;
f % clr.hex_value();
f % txt;
return f.str();
=== modified file 'src/graphic/text_layout.h'
--- src/graphic/text_layout.h 2015-10-09 08:35:26 +
+++ src/graphic/text_layout.h 2016-01-24 09:24:17 +
@@ -23,6 +23,7 @@
#include
#include
+#include "graphic/align.h"
#include "graphic/font.h"
#include "graphic/color.h"
#include "graphic/text_constants.h"
@@ -45,6 +46,9 @@
*/
std::string as_uifont
(const std::string&, int ptsize = UI_FONT_SIZE_SMALL, const RGBColor& clr = UI_FONT_CLR_FG);
+std::string as_aligned(const std::string & txt, UI::Align align, int ptsize = UI_FONT_SIZE_SMALL,
+ const RGBColor& clr = UI_FONT_CLR_FG);
+
std::string as_tooltip(const std::string&);
std::string as_waresinfo(const std::string&);
std::string as_window_title(const std::string&);
=== modified file 'src/graphic/wordwrap.cc'
--- src/graphic/wordwrap.cc 2016-01-23 09:18:49 +
+++ src/graphic/wordwrap.cc 2016-01-24 09:24:17 +
@@ -66,12 +66,12 @@
* and a default-constructed text style.
*/
WordWrap::WordWrap() :
- m_wrapwidth(std::numeric_limits::max()), m_draw_caret(false), mode_(WordWrap::Mode::kDisplay)
+ m_wrapwidth(std::numeric_limits::max()), m_draw_caret(false)
{
}
WordWrap::WordWrap(const TextStyle & style, uint32_t gwrapwidth) :
- m_style(style), m_draw_caret(false), mode_(WordWrap::Mode::kDisplay)
+ m_style(style), m_draw_caret(false)
{
m_wrapwidth = gwrapwidth;
@@ -112,9 +112,8 @@
* Perform the wrapping computations for the given text and fill in
* the private data containing the wrapped results.
*/
-void WordWrap::wrap(const std::string & text, WordWrap::Mode mode)
+void WordWrap::wrap(const std::string & text)
{
- mode_ = mode;
m_lines.clear();
std::string::size_type line_start = 0;
@@ -378,17 +377,13 @@
}
const Image* entry_text_im =
-
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1532279 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1532279. ___ 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-1532279 into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1532279. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/codecheck_compiler_fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/codecheck_compiler_fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/codecheck_compiler_fixes/+merge/283722 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/codecheck_compiler_fixes. ___ 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-1532279 into lp:widelands
And also tested, works fine. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1532279. ___ 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/bug-1537157 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1537157 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___ 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-1532279 into lp:widelands
Review: Approve
One nit, otherwise lgtm.
Diff comments:
>
> === modified file 'src/ui_basic/spinbox.cc'
> --- src/ui_basic/spinbox.cc 2016-01-01 18:41:20 +
> +++ src/ui_basic/spinbox.cc 2016-01-24 07:44:27 +
> @@ -108,7 +108,7 @@
> uint32_t padding = 2;
> uint32_t actual_w = std::max(w, unit_w);
> uint32_t no_padding = (is_big ? 6 : 4);
> - uint32_t texth = UI::g_fh1->render(as_uifont("."))->height();
> + uint32_t texth = UI::g_fh1->render(as_uifont("."))->height() + 2;
Maybe a comment about the magic 2?
> uint32_t buttonh = 20;
>
> // 40 is an ad hoc width estimate for the MultilineTextarea scrollbar +
> a bit of text.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1532279/+merge/283720
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1532279.
___
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/string-fixes into lp:widelands
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
