Skip to content
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

Remove DrawPoints & DrawLines methods #3303

Merged
merged 10 commits into from Jan 6, 2015

Conversation

fluffyfreak
Copy link
Contributor

This removes the DrawPoints and DrawLines methods from the renderer replacing all of the calls to them with a new Drawables::Points class and the existing Drawables::Lines class.

It affects the Scanner widget, the SectorView, targetting crosshairs, SystemView selection boxes, the GalacticView "You Are here" green indicator, HudTrails, SpeedLines, TextEntry and probably a few other bits I've forgotten to list.

I.e: everything it changes should be quite visible, so if you would like to test then please take a look and compare how it used to look to how it currently does.
I've tried to do this as I've gone along but some of the changes affect a number of areas and I might have missed them.

On some platforms / combinations of hardware / drivers it might improve performance due to it reusing buffers instead of allocating and releasing them constantly but this is difficult to measure as I don't have a wide enough range of equipment to test on.

Andy

@laarmen
Copy link
Contributor

laarmen commented Jan 3, 2015

Should we organise a crowdfunding campaign to buy you lots and lots of
hardware ? :-)

@fluffyfreak
Copy link
Contributor Author

I wouldn't object too strenuously but my girlfriend already complains about all my junk :D

@impaktor
Copy link
Member

impaktor commented Jan 3, 2015

My girlfriend complains about my junk too.

Please feel free to use that out of context

@impaktor
Copy link
Member

impaktor commented Jan 3, 2015

OK, there's a time and place for bad jokes (namely always and everywhere).

I'm just curious, is this is a code clean up?

If it does anything with lines and hyperspace, then perhaps @radius75 want's to check out #2690.

@fluffyfreak
Copy link
Contributor Author

Bit optimisation, bit refactoring, bit code cleanup.

It avoids doing conversions and creating/destroying buffers so should run a bit faster. Also it removes the old interfaces in favour of Drawables classes.

@fluffyfreak
Copy link
Contributor Author

Oh and it does kind of bug fix one thing, points were all being drawn at size 1.0f due to the change t OpenGL 3.1 but with this using the new Drawables::Points class they're now using the sizes again.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

Happy 2015. I see you've been busy doing good things.

I'm testing this. I have some problems. Some exiting the program without messages, and others like this.

*** glibc detected *** src/./pioneersp: double free or corruption (out): 0x0000000025251110 ***
======= Backtrace: =========
/lib/x86_64-linux-gnu/libc.so.6(+0x7e846)[0x7f71a6ee1846]
src/./pioneersp[0x566a90]
src/./pioneersp[0x566b09]
src/./pioneersp[0x52238d]
src/./pioneersp[0x524824]
src/./pioneersp[0x44cd81]
src/./pioneersp[0x4c5117]
src/./pioneersp[0x4c6095]
src/./pioneersp[0x410099]
/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xed)[0x7f71a6e8476d]
src/./pioneersp[0x411e8d]
======= Memory map: ========
00400000-00e88000 r-xp 00000000 08:0c 3690452 /media/auxiliar/Building/APIONEER64/pioneersp/src/pioneersp
01087000-01166000 r--p 0Happy 2015. I see you've been busy doing good things.

This can have relationship with this PR?0a87000 08:0c 3690452 /media/auxiliar/Building/APIONEER64/pioneersp/src/pioneersp
01166000-0116d000 rw-p 00b66000 08:0c 3690452 /media/auxiliar/Building/APIONEER64/pioneersp/src/pioneersp
0116d000-011fb000 rw-p 00000000 00:00 0
01c35000-2b892000 rw-p 00000000 00:00 0 [heap]
400ff000-40101000 r-xs 00000000 08:03 655022 /tmp/glA5XTCW (deleted)
403c5000-40463000 rw-p 00000000 00:00 0
7f717642e000-7f717a42f000 rw-p 00000000 00:00 0
7f7180000000-7f7180030000 rw-p 00000000 00:00 0
7f7180030000-7f7184000000 ---p 00000000 00:00 0
7f7184000000-7f718402b000 rw-p 00000000 00:00 0
7f718402b000-7f7188000000 ---p 00000000 00:00 0
7f7188000000-7f718802e000 rw-p 00000000 00:00 0
7f718802e000-7f718c000000 ---p 00000000 00:00 0
7f718c000000-7f718c038000 rw-p 00000000 00:00 0
7f718c038000-7f7190000000 ---p 00000000 00:00 0
7f7190000000-7f7190679000 rw-p 00000000 00:00 0
7f7190679000-7f7194000000 ---p 00000000 00:00 0
7f719657d000-7f719697d000 rw-s b6792000 00:05 8675 /dev/nvidia0
7f719697d000-7f7197b50000 rw-p 00000000 00:00 0
7f7197b50000-7f7197b51000 ---p 00000000 00:00 0
7f7197b51000-7f7198351000 rw-p 00000000 00:00 0
7f7198351000-7f719c352000 rw-s 00000000 00:12 69592 /run/shm/pulse-shm-2975395393
7f719c352000-7f719c36a000 r-xp 00000000 08:03 655584 /lib/x86_64-linux-gnu/libresolv-2.15.so
7f719c36a000-7f719c56a000 ---p 00018000 08:03 655584 /lib/x86_64-linux-gnu/libresolv-2.15.so
7f719c56a000-7f719c56b000 r--p 00018000 08:03 655584 /lib/x86_64-linux-gnu/libresolv-2.15.so
7f719c56b000-7f719c56c000 rw-p 00019000 08:03 655584 /lib/x86_64-linux-gnu/libresolv-2.15.so
7f719c56c000-7f719c56e000 rw-p 00000000 00:00 0
7f719c56e000-7f719c821000 r-xp 00000000 08:03 270274 /usr/lib/x86_64-linux-gnu/libvorbisenc.so.2.0.8
7f719c821000-7f719ca20000 ---p 002b3000 08:03 270274 /usr/lib/x86_64-linux-gnu/libvorbisenc.so.2.0.8
7f719ca20000-7f719ca3c000 r--p 002b2000 08:03 270274 /usr/lib/x86_64-linux-gnu/libvorbisenc.so.2.0.8
7f719ca3c000-7f719ca3d000 rw-p 002ce000 08:03 270274 /usr/lib/x86_64-linux-gnu/libvorbisenc.so.2.0.8
7f719ca3d000-7f719ca85000 r-xp 00000000 08:03 262532 /usr/lib/x86_64-linux-gnu/libFLAC.so.8.2.0
7f719ca85000-7f719cc85000 ---p 00048000 08:03 262532 /usr/lib/x86_64-linux-gnu/libFLAC.so.8.2.0
7f719cc85000-7f719cc86000 r--p 00048000 08:03 262532 /usr/lib/x86_64-linux-gnu/libFLAC.so.8.2.0
7f719cc86000-7f719cc87000 rw-p 00049000 08:03 262532 /usr/lib/x86_64-linux-gnu/libFLAC.so.8.2.0
7f719cc87000-7f719cc9e000 r-xp 00000000 08:03 655581 /lib/x86_64-linux-gnu/libnsl-2.15.so
7f719cc9e000-7f719ce9d000 ---p 00017000 08:03 655581 /lib/x86_64-linux-gnu/libnsl-2.15.so
7f719ce9d000-7f719ce9e000 r--p 00016000 08:03 655581 /lib/x86_64-linux-gnu/libnsl-2.15.so
7f719ce9e000-7f719ce9f000 rw-p 00017000 08:03 655581 /lib/x86_64-linux-gnu/libnsl-2.15.so
7f719ce9f000-7f719cea1000 rw-p 00000000 00:00 0
7f719cea1000-7f719cea6000 r-xp 00000000 08:03 269761 /usr/lib/x86_64-linux-gnu/libasyncns.so.0.3.1
7f719cea6000-7f719d0a5000 ---p 00005000 08:03 269761 /usr/lib/x86_64-linux-gnu/libasyncns.so.0.3.1
7f719d0a5000-7f719d0a6000 r--p 00004000 08:03 269761 /usr/lib/x86_64-linux-gnu/libasyncns.so.0.3.1
7f719d0a6000-7f719d0a7000 rw-p 00005000 08:03 269761 /usr/lib/x86_64-linux-gnu/libasyncns.so.0.3.1
7f719d0a7000-7f719d107000 r-xp 00000000 08:03 270209 /usr/lib/x86_64-linux-gnu/libsndfile.so.1.0.25
7f719d107000-7f719d307000 ---p 00060000 08:03 270209 /usr/lib/x86_64-linux-gnu/libsndfile.so.1.0.25
7f719d307000-7f719d309000 r--p 00060000 08:03 270209 /usr/lib/x86_64-linux-gnu/libsndfile.so.1.0.25
7f719d309000-7f719d30a000 rw-p 00062000 08:03 270209 /usr/lib/x86_64-linux-gnu/libsndfile.so.1.0.25
7f719d30a000-7f719d30e000 rw-p 00000000 00:00 0
7f719d30e000-7f719d316000 r-xp 00000000 08:03 657134 /lib/x86_64-linux-gnu/libwrap.so.0.7.6
7f719d316000-7f719d515000 ---p 00008000 08:03 657134 /lib/x86_64-linux-gnu/libwrap.so.0.7.6
7f719d515000-7f719d516000 r--p 00007000 08:03 657134 /lib/x86_64-linux-gnu/libwrap.so.0.7.6
7f719d516000-7f719d517000 rw-p 00008000 08:03 657134 /lib/x86_64-linux-gnu/libwrap.so.0.7.6
7f719d517000-7f719d51e000 r-xp 00000000 08:03 262457 /usr/lib/x86_64-linux-gnu/libjson.so.0.0.1
7f719d51e000-7f719d71d000 ---p 00007000 08:03 262457 /usr/lib/x86_64-linux-gnu/libjson.so.0.0.1
7f719d71d000-7f719d71e000 r--p 00006000 08:03 262457 /usr/lib/x86_64-linux-gnu/libjson.so.0.0.1
7f719d71e000-7f719d71f000 rw-p 00007000 08:03 262457 /usr/lib/x86_64-linux-gnu/libjson.so.0.0.1
7f719d71f000-7f719d77b000 r-xp 00000000 08:03 264891 /usr/lib/x86_64-linux-gnu/libpulsecommon-1.1.so
7f719d77b000-7f719d97b000 ---p 0005c000 08:03 264891 /usr/lib/x86_64-linux-gnu/libpulsecommon-1.1.so
7f719d97b000-7f719d97c000 r--p 0005c000 08:03 264891 /usr/lib/x86_64-linux-gnu/libpulsecommon-1.1.so
7f719d97c000-7f719d97d000 rw-p 0005d000 08:03 264891 /usr/lib/x86_64-linux-gnu/libpulsecommon-1.1.so
7f719d97d000-7f719d9c3000 r-xp 00000000 08:03 262017 /usr/lib/x86_64-linux-gnu/libpulse.so.0.13.5
7f719d9c3000-7f719dbc3000 ---p 00046000 08:03 262017 /usr/lib/x86_64-linux-gnu/libpulse.so.0.13.5
7f719dbc3000-7f719dbc4000 r--p 00046000 08:03 262017 /usr/lib/x86_64-linux-gnu/libpulse.so.0.13.5
7f719dbc4000-7f719dbc5000 rw-p 00047000 08:03 262017 /usr/lib/x86_64-linux-gnu/libpulse.so.0.13.5
7f719dfc5000-7f719e3c5000 rw-s c2079000 00:05 8675 /dev/nvidia0
7f719e76f000-7f719e8f6000 rw-s c4c6f000 00:05 8675 /dev/nvidia0
7f719e8f6000-7f719e8f9000 r-xp 00000000 08:03 262078 /usr/lib/x86_64-linux-gnu/libpulse-simple.so.0.0.3
7f719e8f9000-7f719eaf8000 ---p 00003000 08:03 262078 /usr/lib/x86_64-linux-gnu/libpulse-simple.so.0.0.3
7f719eaf8000-7f719eaf9000 r--p 00002000 08:03 262078 /usr/lib/x86_64-linux-gnu/libpulse-simple.so.0.0.3
7f719eaf9000-7f719eafa000 rw-p 00003000 08:03 262078 /usr/lib/x86_64-linux-gnu/libpulse-simple.so.0.0.3
7f719eb1d000-7f719ed1d000 rw-s 113a89000 00:05 8675 /dev/nvidia0
7f719ed1d000-7f719ef1d000 rw-s 36c67000 00:05 8675 /dev/nvidia0
7f719ef1d000-7f719f11d000 rw-s c085f000 00:05 8675 /dev/nvidia0
7f719f11d000-7f719f31d000 rw-s c4c29000 00:05 8675 /dev/nvidia0
7f719f31d000-7f719f51d000 rw-s 18b392000 00:05 8675 /dev/nvidia0
7f719f51d000-7f719f71d000 rw-s 1759fc000 00:05 8675 /dev/nvidia0
7f719f71d000-7f719f81e000 rw-p 00000000 00:00 0
7f719f91f000-7f719f920000 ---p 00000000 00:00 0
7f719f920000-7f71a0120000 rw-p 00000000 00:00 0
7f71a0120000-7f71a0121000 ---p 00000000 00:00 0
7f71a0121000-7f71a0921000 rw-p 00000000 00:00 0
7f71a0921000-7f71a0922000 ---p 00000000 00:00 0
7f71a0922000-7f71a1122000 rw-p 00000000 00:00 0
7f71a1122000-7f71a1123000 ---p 00000000 00:00 0
7f71a1123000-7f71a1923000 rw-p 00000000 00:00 0
7f71a1923000-7f71a1b23000 rw-s 10f5e9000 00:05 8675 /dev/nvidia0
7f71a1b23000-7f71a1d23000 rw-s 10f5dd000 00:05 8675 /dev/nvidia0
7f71a1d23000-7f71a1f23000 rw-s 17ebb6000 00:05 8675 /dev/nvidia0
7f71a2023000-7f71a202a000 rw-s 200bcb000 00:05 8675 /dev/nvidia0
7f71a202a000-7f71a204a000 rw-s d0160000 00:05 8675 /dev/nvidia0
7f71a204a000-7f71a208a000 rw-s 1fbb03000 00:05 8675 /dev/nvidia0
7f71a208a000-7f71a20aa000 rw-s 107ee9000 00:05 8675 /dev/nvidia0
7f71a20aa000-7f71a2163000 rw-p 00000000 00:00 0
7f71a222c000-7f71a226e000 r-xp 00000000 08:03 655029 /lib/x86_64-linux-gnu/libdbus-1.so.3.5.8
7f71a226e000-7f71a246e000 ---p 00042000 08:03 655029 /lib/x86_64-linux-gnu/libdbus-1.so.3.5.8
7f71a246e000-7f71a246f000 r--p 00042000 08:03 655029 /lib/x86_64-linux-gnu/libdbus-1.so.3.5.8
7f71a246f000-7f71a2470000 rw-p 00043000 08:03 655029 /lib/x86_64-linux-gnu/libdbus-1.so.3.5.8
7f71a2470000-7f71a2477000 r-xp 00000000 08:03 264754 /usr/lib/x86_64-linux-gnu/libXrandr.so.2.2.0
7f71a2477000-7f71a2676000 ---p 00007000 08:03 264754 /usr/lib/x86_64-linux-gnu/libXrandr.so.2.2.0
7f71a2676000-7f71a2677000 r--p 00006000 08:03 264754 /usr/lib/x86_64-linux-gnu/libXrandr.so.2.2.0
7f71a2677000-7f71a2678000 rw-p 00007000 08:03 264754 /usr/lib/x86_64-linux-gnu/libXrandr.so.2.2.0
7f71a2678000-7f71a2687000 r-xp 00000000 08:03 265904 /usr/lib/x86_64-linux-gnu/libXi.so.6.1.0
7f71a2687000-7f71a2886000 ---p 0000f000 08:03 265904 /usr/lib/x86_64-linux-gnu/libXi.so.6.1.0
7f71a2886000-7f71a2887000 r--p 0000e000 08:03 265904 /usr/lib/x86_64-linux-gnu/libXi.so.6.1.0
7f71a2887000-7f71a2888000 rw-p 0000f000 08:03 265904 /usr/lib/x86_64-linux-gnu/libXi.so.6.1.0
7f71a2888000-7f71a288a000 r-xp 00000000 08:03 266993 /usr/lib/x86_64-linux-gnu/libXinerama.so.1.0.0
7f71a288a000-7f71a2a89000 ---p 00002000 08:03 266993 /usr/lib/x86_64-linux-gnu/libXinerama.so.1.0.0
7f71a2a89000-7f71a2a8a000 r--p 00001000 08:03 266993 /usr/lib/x86_64-linux-gnu/libXinerama.so.1.0.0
7f71a2a8a000-7f71a2a8b000 rw-p 00002000 08:03 266993 /usr/lib/x86_64-linux-gnu/libXinerama.so.1.0.0
7f71a2a8b000-7f71a2a90000 r-xp 00000000 08:03 264691 /usr/lib/x86_64-linux-gnu/libXfixes.so.3.1.0
7f71a2a90000-7f71a2c8f000 ---p 00005000 08:03 264691 /usr/lib/x86_64-linux-gnu/libXfixes.so.3.1.0
7f71a2c8f000-7f71a2c90000 r--p 00004000 08:03 264691 /usr/lib/x86_64-linux-gnu/libXfixes.so.3.1.0
7f71a2c90000-7f71a2c91000 rw-p 00005000 08:03 264691 /usr/lib/x86_64-linux-gnu/libXfixes.so.3.1.0
7f71a2c91000-7f71a2c9a000 r-xp 00000000 08:03 264702 /usr/lib/x86_64-linux-gnu/libXrender.so.1.3.0
7f71a2c9a000-7f71a2e99000 ---p 00009000 08:03 264702 /usr/lib/x86_64-linux-gnu/libXrender.so.1.3.0
7f71a2e99000-7f71a2e9a000 r--p 00008000 08:03 264702 /usr/lib/x86_64-linux-gnu/libXrender.so.1.3.0
7f71a2e9a000-7f71a2e9b000 rw-p 00009000 08:03 264702 /usr/lib/x86_64-linux-gnu/libXrender.so.1.3.0
7f71a2e9b000-7f71a2ea4000 r-xp 00000000 08:03 265856 /usr/lib/x86_64-linux-gnu/libXcursor.so.1.0.2
7f71a2ea4000-7f71a30a3000 ---p 00009000 08:03 265856 /usr/lib/x86_64-linux-gnu/libXcursor.so.1.0.2
7f71a30a3000-7f71a30a4000 r--p 00008000 08:03 265856 /usr/lib/x86_64-linux-gnu/libXcursor.so.1.0.2
7f71a30a4000-7f71a30a5000 rw-p 00009000 08:03 265856 /usr/lib/x86_64-linux-gnu/libXcursor.so.1.0.2
7f71a30a5000-7f71a30aa000 r-xp 00000000 08:03 269715 /usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
7f71a30aa000-7f71a32a9000 ---p 00005000 08:03 269715 /usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
7f71a32a9000-7f71a32aa000 r--p 00004000 08:03 269715 /usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
7f71a32aa000-7f71a32ab000 rw-p 00005000 08:03 269715 /usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
7f71a32ab000-7f71a32ad000 r-xp 00000000 08:03 269704 /usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
7f71a32ad000-7f71a34ac000 ---p 00002000 08:03 269704 /usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
7f71a34ac000-7f71a34ad000 r--p 00001000 08:03 269704 /usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
7f71a34ad000-7f71a34ae000 rw-p 00002000 08:03 269704 /usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
7f71a34ae000-7f71a34cb000 r-xp 00000000 08:03 261597 /usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
7f71a34cb000-7f71a36ca000 ---p 0001d000 08:03 261597 /usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
7f71a36ca000-7f71a36cb000 r--p 0001c000 08:03 261597 /usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
7f71a36cb000-7f71a36cc000 rw-p 0001d000 08:03 261597 /usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
7f71a36cc000-7f71a36d2000 r-xp 00000000 08:03 270114 /usr/lib/x86_64-linux-gnu/libogg.so.0.7.1
7f71a36d2000-7f71a38d1000 ---p 00006000 08:03 270114 /usr/lib/x86_64-linux-gnu/libogg.so.0.7.1
7f71a38d1000-7f71a38d2000 r--p 00005000 08:03 270114 /usr/lib/x86_64-linux-gnu/libogg.so.0.7.1
7f71a38d2000-7f71a38d3000 rw-p 00006000 08:03 270114 /usr/lib/x86_64-linux-gnu/libogg.so.0.7.1
7f71a38d3000-7f71a38fe000 r-xp 00000000 08:03 270272 /usr/lib/x86_64-linux-gnu/libvorbis.so.0.4.5
7f71a38fe000-7f71a3afd000 ---p 0002b000 08:03 270272 /usr/lib/x86_64-linux-gnu/libvorbis.so.0.4.5
7f71a3afd000-7f71a3afe000 r--p 0002a000 08:03 270272 /usr/lib/x86_64-linux-gnu/libvorbis.so.0.4.5
7f71a3afe000-7f71a3aff000 rw-p 0002b000 08:03 270272 /usr/lib/x86_64-linux-gnu/libvorbis.so.0.4.5
7f71a3aff000-7f71a3b0f000 r-xp 00000000 08:03 264619 /usr/lib/x86_64-linux-gnu/libXext.so.6.4.0
7f71a3b0f000-7f71a3d0e000 ---p 00010000 08:03 264619 /usr/lib/x86_64-linux-gnu/libXext.so.6.4.0
7f71a3d0e000-7f71a3d0f000 r--p 0000f000 08:03 264619 /usr/lib/x86_64-linux-gnu/libXext.so.6.4.0
7f71a3d0f000-7f71a3d10000 rw-p 00010000 08:03 264619 /usr/lib/x86_64-linux-gnu/libXext.so.6.4.0
7f71a3d10000-7f71a3e40000 r-xp 00000000 08:03 262996 /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
7f71a3e40000-7f71a4040000 ---p 00130000 08:03 262996 /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
7f71a4040000-7f71a4041000 r--p 00130000 08:03 262996 /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
7f71a4041000-7f71a4045000 rw-p 00131000 08:03 262996 /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
7f71a4045000-7f71a5bad000 r-xp 00000000 08:03 271238 /usr/lib/nvidia-331-updates/libnvidia-glcore.so.331.113
7f71a5bad000-7f71a5dac000 ---p 01b68000 08:03 271238 /usr/lib/nvidia-331-updates/libnvidia-glcore.so.331.113
7f71a5dac000-7f71a6837000 rwxp 01b67000 08:03 271238 /usr/lib/nvidia-331-updates/libnvidia-glcore.so.331.113
7f71a6837000-7f71a6854000 rwxp 00000000 00:00 0
7f71a6854000-7f71a6857000 r-xp 00000000 08:03 268470 /usr/lib/nvidia-331-updates/tls/libnvidia-tls.so.331.113
7f71a6857000-7f71a6a56000 ---p 00003000 08:03 268470 /usr/lib/nvidia-331-updates/tls/libnvidia-tls.so.331.113
7f71a6a56000-7f71a6a57000 rw-p 00002000 08:03 268470 /usr/lib/nvidia-331-updates/tls/libnvidia-tls.so.331.113
7f71a6a57000-7f71a6a5e000 r-xp 00000000 08:03 655579 /lib/x86_64-linux-gnu/librt-2.15.so
7f71a6a5e000-7f71a6c5d000 ---p 00007000 08:03 655579 /lib/x86_64-linux-gnu/librt-2.15.so
7f71a6c5d000-7f71a6c5e000 r--p 00006000 08:03 655579 /lib/x86_64-linux-gnu/librt-2.15.so
7f71a6c5e000-7f71a6c5f000 rw-p 00007000 08:03 655579 /lib/x86_64-linux-gnu/librt-2.15.so
7f71a6c5f000-7f71a6c61000 r-xp 00000000 08:03 655597 /lib/x86_64-linux-gnu/libdl-2.15.so
7f71a6c61000-7f71a6e61000 ---p 00002000 08:03 655597 /lib/x86_64-linux-gnu/libdl-2.15.so
7f71a6e61000-7f71a6e62000 r--p 00002000 08:03 655597 /lib/x86_64-linux-gnu/libdl-2.15.so
7f71a6e62000-7f71a6e63000 rw-p 00003000 08:03 655597 /lib/x86_64-linux-gnu/libdl-2.15.so
7f71a6e63000-7f71a7018000 r-xp 00000000 08:03 655583 /lib/x86_64-linux-gnu/libc-2.15.so
7f71a7018000-7f71a7217000 ---p 001b5000 08:03 655583 /lib/x86_64-linux-gnu/libc-2.15.so
7f71a7217000-7f71a721b000 r--p 001b4000 08:03 655583 /lib/x86_64-linux-gnu/libc-2.15.so
7f71a721b000-7f71a721d000 rw-p 001b8000 08:03 655583 /lib/x86_64-linux-gnu/libc-2.15.so
7f71a721d000-7f71a7222000 rw-p 00000000 00:00 0
7f71a7222000-7f71a7238000 r-xp 00000000 08:03 655668 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f71a7238000-7f71a7437000 ---p 00016000 08:03 655668 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f71a7437000-7f71a7438000 r--p 00015000 08:03 655668 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f71a7438000-7f71a7439000 rw-p 00016000 08:03 655668 /lib/x86_64-linux-gnu/libgcc_s.so.1
7f71a7439000-7f71a7534000 r-xp 00000000 08:03 655586 /lib/x86_64-linux-gnu/libm-2.15.so
7f71a7534000-7f71a7733000 ---p 000fb000 08:03 655586 /lib/x86_64-linux-gnu/libm-2.15.so
7f71a7733000-7f71a7734000 r--p 000fa000 08:03 655586 /lib/x86_64-linux-gnu/libm-2.15.so
7f71a7734000-7f71a7735000 rw-p 000fb000 08:03 655586 /lib/x86_64-linux-gnu/libm-2.15.so
7f71a7735000-7f71a7822000 r-xp 00000000 08:03 264141 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
7f71a7822000-7f71a7a21000 ---p 000ed000 08:03 264141 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
7f71a7a21000-7f71a7a2a000 r--p 000ec000 08:03 264141 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
7f71a7a2a000-7f71a7a2c000 rw-p 000f5000 08:03 264141 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
7f71a7a2c000-7f71a7a41000 rw-p 00000000 00:00 0
7f71a7a41000-7f71a7a57000 r-xp 00000000 08:03 657136 /lib/x86_64-linux-gnu/libz.so.1.2.3.4
7f71a7a57000-7f71a7c56000 ---p 00016000 08:03 657136 /lib/x86_64-linux-gnu/libz.so.1.2.3.4
7f71a7c56000-7f71a7c57000 r--p 00015000 08:03 657136 /lib/x86_64-linux-gnu/libz.so.1.2.3.4
7f71a7c57000-7f71a7c58000 rw-p 00016000 08:03 657136 /lib/x86_64-linux-gnu/libz.so.1.2.3.4
7f71a7c58000-7f71a7c7e000 r-xp 00000000 08:03 657102 /lib/x86_64-linux-gnu/libpng12.so.0.46.0
7f71a7c7e000-7f71a7e7e000 ---p 00026000 08:03 657102 /lib/x86_64-linux-gnu/libpng12.so.0.46.0
7f71a7e7e000-7f71a7e7f000 r--p 00026000 08:03 657102 /lib/x86_64-linux-gnu/libpng12.so.0.46.0
7f71a7e7f000-7f71a7e80000 rw-p 00027000 08:03 657102 /lib/x86_64-linux-gnu/libpng12.so.0.46.0
7f71a7e80000-7f71a7e87000 r-xp 00000000 08:03 270276 /usr/lib/x86_64-linux-gnu/libvorbisfile.so.3.3.4
7f71a7e87000-7f71a8086000 ---p 00007000 08:03 270276 /usr/lib/x86_64-linux-gnu/libvorbisfile.so.3.3.4
7f71a8086000-7f71a8087000 r--p 00006000 08:03 270276 /usr/lib/x86_64-linux-gnu/libvorbisfile.so.3.3.4
7f71a8087000-7f71a8088000 rw-p 00007000 08:03 270276 /usr/lib/x86_64-linux-gnu/libvorbisfile.so.3.3.4
7f71a8088000-7f71a808c000 r-xp 00000000 08:03 270204 /usr/lib/x86_64-linux-gnu/libsigc-2.0.so.0.0.0
7f71a808c000-7f71a828b000 ---p 00004000 08:03 270204 /usr/lib/x86_64-linux-gnu/libsigc-2.0.so.0.0.0
7f71a828b000-7f71a828c000 r--p 00003000 08:03 270204 /usr/lib/x86_64-linux-gnu/libsigc-2.0.so.0.0.0
7f71a828c000-7f71a828d000 rw-p 00004000 08:03 270204 /usr/lib/x86_64-linux-gnu/libsigc-2.0.so.0.0.0
7f71a828d000-7f71a82a5000 r-xp 00000000 08:03 655577 /lib/x86_64-linux-gnu/libpthread-2.15.so
7f71a82a5000-7f71a84a4000 ---p 00018000 08:03 655577 /lib/x86_64-linux-gnu/libpthread-2.15.so
7f71a84a4000-7f71a84a5000 r--p 00017000 08:03 655577 /lib/x86_64-linux-gnu/libpthread-2.15.so
7f71a84a5000-7f71a84a6000 rw-p 00018000 08:03 655577 /lib/x86_64-linux-gnu/libpthread-2.15.so
7f71a84a6000-7f71a84aa000 rw-p 00000000 00:00 0
7f71a84aa000-7f71a8587000 r-xp 00000000 08:03 268467 /usr/lib/nvidia-331-updates/libGL.so.331.113
7f71a8587000-7f71a8786000 ---p 000dd000 08:03 268467 /usr/lib/nvidia-331-updates/libGL.so.331.113
7f71a8786000-7f71a87c6000 rwxp 000dc000 08:03 268467 /usr/lib/nvidia-331-updates/libGL.so.331.113
7f71a87c6000-7f71a87dd000 rwxp 00000000 00:00 0
7f71a87dd000-7f71a8873000 r-xp 00000000 08:03 269136 /usr/lib/x86_64-linux-gnu/libfreetype.so.6.8.0
7f71a8873000-7f71a8a72000 ---p 00096000 08:03 269136 /usr/lib/x86_64-linux-gnu/libfreetype.so.6.8.0
7f71a8a72000-7f71a8a78000 r--p 00095000 08:03 269136 /usr/lib/x86_64-linux-gnu/libfreetype.so.6.8.0
7f71a8a78000-7f71a8a79000 rw-p 0009b000 08:03 269136 /usr/lib/x86_64-linux-gnu/libfreetype.so.6.8.0
7f71a8a79000-7f71a8a88000 r-xp 00000000 08:03 655576 /lib/x86_64-linux-gnu/ld-2.15.so
7f71a8a88000-7f71a8a89000 r-xp 0000f000 08:03 655576 /lib/x86_64-linux-gnu/ld-2.15.so
7f71a8a89000-7f71a8a9b000 r-xp 00010000 08:03 655576 /lib/x86_64-linux-gnu/ld-2.15.so
7f71a8aab000-7f71a8aeb000 rw-s 1133d4000 00:05 8675 /dev/nvidia0
7f71a8b0b000-7f71a8bcf000 rw-s 1fe11f000 00:05 8675 /dev/nvidia0
7f71a8bcf000-7f71a8c77000 rw-p 00000000 00:00 0
7f71a8c77000-7f71a8c7e000 r--s 00000000 08:03 407092 /usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
7f71a8c7e000-7f71a8c80000 rw-p 00000000 00:00 0
7f71a8c80000-7f71a8c82000 rw-s 00000000 08:03 655022 /tmp/glA5XTCW (deleted)
7f71a8c82000-7f71a8c83000 rw-s 1f8d7c000 00:05 8675 /dev/nvidia0
7f71a8c83000-7f71a8c87000 rw-s 1d953b000 00:05 8675 /dev/nvidia0
7f71a8c87000-7f71a8c88000 rw-s dfd61000 00:05 8675 /dev/nvidia0
7f71a8c88000-7f71a8c89000 rw-s dfd61000 00:05 8675 /dev/nvidia0
7f71a8c89000-7f71a8c8a000 rw-s f9641000 00:05 8675 /dev/nvidia0
7f71a8c8a000-7f71a8c8b000 rw-s 21ab90000 00:05 8675 /dev/nvidia0
7f71a8c8b000-7f71a8c8c000 rw-s 107e04000 00:05 8675 /dev/nvidia0
7f71a8c8c000-7f71a8c8d000 rw-s f9060000 00:05 8675 /dev/nvidia0
7f71a8c8d000-7f71a8c9b000 rw-p 00000000 00:00 0
7f71a8c9b000-7f71a8c9c000 r--p 00022000 08:03 655576 /lib/x86_64-linux-gnu/ld-2.15.so
7f71a8c9c000-7f71a8c9e000 rw-p 00023000 08:03 655576 /lib/x86_64-linux-gnu/ld-2.15.so
7fffb395a000-7fffb397b000 rw-p 00000000 00:00 0 [stack]
7fffb39ff000-7fffb3a00000 r-xp 00000000 00:00 0 [vdso]
ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

Other:

pioneersp: opengl/VertexBufferGL.cpp:61: Graphics::OGL::VertexBuffer::VertexBuffer(const Graphics::VertexBufferDesc&): Assertion `m_desc.numVertices > 0' failed.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

The view of the Scanner has been ok with this PR.

Missing fix the size of the stars in background. Very small, since the implementation of GL3

@fluffyfreak
Copy link
Contributor Author

Fixed a bug with the GuiTexturedQuad, it wasn't being updated per call like it used to be so only the initial on screen position / size was being used. Now it initialises it to a fixed size/position but then translates it using the transform.
Much better than updating the vertex data each time.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

screenshot-20150104-090510

@fluffyfreak
Copy link
Contributor Author

Ah, good catch @walterar, thanks.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

I have more, but I tell you one by one. :)

@fluffyfreak
Copy link
Contributor Author

Keep 'em coming that way I can tackle them all at once :) they might have things in common!

@fluffyfreak
Copy link
Contributor Author

Yes I've found a few bugs. Really dumb code in some cases, all mine I might add! :D
Ok, no point testing further right now as this is going to affect several things and take me a while (few hours) to fix.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

If you've managed to lay a big white elephant in a mini cooper, no impossible task for you. :))

@fluffyfreak
Copy link
Contributor Author

Right, that should fix the worst of the stupid mistakes.
Points are drawn using TRIANGLES instead of as a TRIANGLE_STRIP, obvious really so don't know why I did that.
Also we need to reset the VertexBuffer when the number of points changes so we don't overwrite the locked GPU buffer which crashes the nvogl.dll (oops).
Finally, stop backface culling the Points because it's dumb. Some places flip the orientation of the orthographic view! Crazy shit I keep finding in this engine.

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

Better now. And very stable, until I could try.

screenshot-20150104-192155

@fluffyfreak
Copy link
Contributor Author

What's wrong with that? I think I'll have to go back a while to find what it used to look like but they weren't supposed to be rendering as tiny points this is actually closer to the sizes that were always being requested.

I do agree however that it looks a bit crap ;)

@walterar
Copy link
Contributor

walterar commented Jan 4, 2015

Reminds me minecraft ;)

@impaktor
Copy link
Member

impaktor commented Jan 5, 2015

Scanner blobs are now square and are more easy to see, at least at my end. I don't know if that's a bug or feature.

I wonder if #2834 is affected by this?

@fluffyfreak
Copy link
Contributor Author

Yes blobs have been missing for a while now, although I hadn't noticed #2834 myself!

Any objections to me merging this soon (later today)?

@impaktor
Copy link
Member

impaktor commented Jan 6, 2015

Any objections to me merging this soon (later today)?

Fine by me

fluffyfreak added a commit that referenced this pull request Jan 6, 2015
Remove DrawPoints & DrawLines methods
@fluffyfreak fluffyfreak merged commit 7af9218 into pioneerspacesim:master Jan 6, 2015
@fluffyfreak fluffyfreak deleted the draw-more-buffers branch January 6, 2015 09:28
@walterar
Copy link
Contributor

walterar commented Jan 6, 2015

@fluffyfreak
Returned to appear this problem:

opengl/VertexBufferGL.cpp:61: Graphics::OGL::VertexBuffer::VertexBuffer(const Graphics::VertexBufferDesc&): Assertion `m_desc.numVertices > 0' failed.

Is relevant to this PR?

@fluffyfreak
Copy link
Contributor Author

Where / When do you get that? I've run it in debug and don't get it anywhere that I can find.

@walterar
Copy link
Contributor

walterar commented Jan 6, 2015

This sometimes occurs when attempting to retrieve a recently saved game. It is likely that the problem is in the serializer.

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

Successfully merging this pull request may close these issues.

None yet

4 participants