]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
Thomas Debesse [Tue, 2 Mar 2021 19:45:17 +0000 (20:45 +0100)]
radiant/build menu: reword Commandline as Command line
Thomas Debesse [Fri, 26 Feb 2021 23:11:42 +0000 (00:11 +0100)]
q3map2: accept -bsp stage option name without complaining
- using it is far more consistent with other stages,
- makes reading options less prone to errors:
reading “q3map3 -meta” may induce to human
reader that meta is a stage while in fact
it's “q3map2 -bsp -meta” and meta is an
option for the bsp stage,
- it is not bad to use the explicit -bsp stage option,
- there is no reason to recommend to not use it.
Thomas Debesse [Fri, 26 Feb 2021 22:16:25 +0000 (23:16 +0100)]
macos: delete now useless gitignore file in setup/
Thomas Debesse [Fri, 26 Feb 2021 22:15:34 +0000 (23:15 +0100)]
macos: set NSHighResolutionCapable to true
Thomas Debesse [Tue, 23 Feb 2021 02:16:31 +0000 (03:16 +0100)]
Thomas Debesse [Tue, 23 Feb 2021 01:17:30 +0000 (02:17 +0100)]
bitmaps: move f-invert icon to tools/bitmaps because it is used
Thomas Debesse [Tue, 23 Feb 2021 01:05:24 +0000 (02:05 +0100)]
radiant/patchmanip: adjust key binds like Garux variant
Thomas Debesse [Tue, 23 Feb 2021 01:01:27 +0000 (02:01 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 23:49:09 +0000 (00:49 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 23:24:05 +0000 (00:24 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 23:19:21 +0000 (00:19 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 23:11:37 +0000 (00:11 +0100)]
radiant/camwindow: use WASD keys like Garux' variant
Thomas Debesse [Mon, 22 Feb 2021 23:03:47 +0000 (00:03 +0100)]
q3map2: add a comment for future readers
Thomas Debesse [Mon, 22 Feb 2021 23:01:16 +0000 (00:01 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 22:34:28 +0000 (23:34 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 22:00:22 +0000 (23:00 +0100)]
q3map2: remove a duplicate probably introduced by some merge conflict
Thomas Debesse [Mon, 22 Feb 2021 21:58:55 +0000 (22:58 +0100)]
q3map2: slowallocate is the default behaviour
Thomas Debesse [Mon, 22 Feb 2021 21:56:53 +0000 (22:56 +0100)]
Thomas Debesse [Mon, 22 Feb 2021 21:09:17 +0000 (22:09 +0100)]
daemonmap: sync submodule
Thomas Debesse [Mon, 22 Feb 2021 19:02:00 +0000 (20:02 +0100)]
cmake: fix whitespace
Thomas Debesse [Mon, 22 Feb 2021 18:49:53 +0000 (19:49 +0100)]
macos: ignore warnings about OpenGL being deprecated
hide those warnings on maCOS:
warning: 'glBegin' is deprecated: first deprecated in macOS 10.14 - OpenGL API deprecated. (Define GL_SILENCE_DEPRECATION to silence these warnings)
Thomas Debesse [Mon, 22 Feb 2021 18:17:00 +0000 (19:17 +0100)]
macos: rework the plist and rename apple to macos in repository
Thomas Debesse [Mon, 22 Feb 2021 18:22:18 +0000 (19:22 +0100)]
library-bundler: don't use -a, it may fail on network shares
also there is no need to preserve owner
Thomas Debesse [Sat, 20 Feb 2021 20:38:50 +0000 (21:38 +0100)]
quake3: delete dead strupr
Thomas Debesse [Sat, 20 Feb 2021 20:09:08 +0000 (21:09 +0100)]
quake2,heretic2: attempt to fix undeclared strupr, <3 Kai
Attempt to fix this:
netradiant/tools/heretic2/h2data/tmix.c:292:5: error: implicit declaration of function 'strupr' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
strupr( buffer );
^
Thomas Debesse [Sat, 20 Feb 2021 13:23:41 +0000 (14:23 +0100)]
library-bundler: rely on gcp instead of cp on macos
Thomas Debesse [Sat, 20 Feb 2021 13:20:28 +0000 (14:20 +0100)]
library-bundler: fix path
path starting with // does not work on msys2
this was introduced by mistake anyway
Thomas Debesse [Sat, 20 Feb 2021 00:43:25 +0000 (01:43 +0100)]
windows: reword a bit the gtkglext workaround
Thomas Debesse [Sat, 20 Feb 2021 19:38:10 +0000 (20:38 +0100)]
macos: set NSHighResolutionCapable to file in plist to attempt to avoid to render only the square of the GL viewport
Thomas Debesse [Sat, 20 Feb 2021 16:41:58 +0000 (17:41 +0100)]
macos: also read arguments
Thomas Debesse [Sat, 20 Feb 2021 10:36:26 +0000 (11:36 +0100)]
macos: don't run in background
Thomas Debesse [Sat, 20 Feb 2021 01:02:28 +0000 (02:02 +0100)]
macos: remove undefined value in plist
Thomas Debesse [Fri, 19 Feb 2021 20:17:08 +0000 (21:17 +0100)]
macos: introduce ugly packing hack to attempt to reduce the size of the residual GL viewport when another tab is expected to be above
HACK: The OpenGL viewport is reduced to one line on the bottom of the window when other tabs are displayed,
so the rectangle is not drawn over the window but a non-bostructing bottom line instead.
Thomas Debesse [Fri, 19 Feb 2021 10:28:12 +0000 (11:28 +0100)]
macos: support for macOS-like GTK theme with light and dark variant selection
Thomas Debesse [Fri, 19 Feb 2021 10:26:31 +0000 (11:26 +0100)]
easy-builder: get number of cpus on macOS a better way
Thomas Debesse [Thu, 18 Feb 2021 19:46:01 +0000 (20:46 +0100)]
q3map2: also look for .dds file in dds/ prefix like Doom3 or Darkplaces
also tell user which image file is found for the given texture path
Thomas Debesse [Thu, 18 Feb 2021 19:08:11 +0000 (20:08 +0100)]
netradiant: also look for .dds file in dds/ prefix like Doom3 or DarkPlaces
also tell user which image file is found for the given texture path
Thomas Debesse [Sat, 20 Feb 2021 12:15:30 +0000 (13:15 +0100)]
about: minor spacing fixes
Thomas Debesse [Thu, 18 Feb 2021 09:41:18 +0000 (10:41 +0100)]
Make About window message more explicit about maintainer and latest build
Thomas Debesse [Mon, 15 Feb 2021 09:50:45 +0000 (09:50 +0000)]
Merge branch 'max' into 'master'
bump MAX_IMAGES, MAX_MODELS
See merge request xonotic/netradiant!170
Garux [Tue, 9 Feb 2021 21:20:32 +0000 (00:20 +0300)]
bump MAX_IMAGES, MAX_MODELS
Thomas Debesse [Mon, 15 Feb 2021 09:18:12 +0000 (09:18 +0000)]
Merge branch 'dds' into 'master'
fix dds loading in 64 bit
See merge request xonotic/netradiant!169
Garux [Sat, 23 Jan 2021 08:23:04 +0000 (11:23 +0300)]
fix dds loading in 64 bit
Thomas Debesse [Wed, 23 Dec 2020 02:17:40 +0000 (03:17 +0100)]
readme: update with macOS and bundling instructions
Thomas Debesse [Wed, 23 Dec 2020 01:46:27 +0000 (02:46 +0100)]
plugin/vfspk3: prevent buffer overflow/stack smashing
This isssue:
```
netradiant/plugins/vfspk3/vfs.cpp:595:7: warning: array index 1024 is past the end of the array (which contains 1024 elements)
[-Warray-bounds]
tmppath[PATH_MAX] = '\0';
^ ~~~~~~~~
netradiant/plugins/vfspk3/vfs.cpp:587:5: note: array 'tmppath' declared here
char tmppath[PATH_MAX];
^
netradiant/plugins/vfspk3/vfs.cpp:607:7: warning: array index 1024 is past the end of the array (which contains 1024 elements)
[-Warray-bounds]
tmppath[PATH_MAX] = '\0';
^ ~~~~~~~~
netradiant/plugins/vfspk3/vfs.cpp:587:5: note: array 'tmppath' declared here
char tmppath[PATH_MAX];
```
is producing this (on macOS):
```
* thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGABRT
frame #0: 0x00007fff58f4f2c6 libsystem_kernel.dylib`__pthread_kill + 10
libsystem_kernel.dylib`__pthread_kill:
-> 0x7fff58f4f2c6 <+10>: jae 0x7fff58f4f2d0 ; <+20>
0x7fff58f4f2c8 <+12>: movq %rax, %rdi
0x7fff58f4f2cb <+15>: jmp 0x7fff58f49457 ; cerror_nocancel
0x7fff58f4f2d0 <+20>: retq
Target 0: (netradiant) stopped.
(lldb) thread backtrace all
* thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGABRT
* frame #0: 0x00007fff58f4f2c6 libsystem_kernel.dylib`__pthread_kill + 10
frame #1: 0x00007fff5900abf1 libsystem_pthread.dylib`pthread_kill + 284
frame #2: 0x00007fff58eb9745 libsystem_c.dylib`__abort + 144
frame #3: 0x00007fff58eb9ff3 libsystem_c.dylib`__stack_chk_fail + 205
frame #4: 0x000000010a8a7e59 libvfspk3.so`InitDirectory(char const*, Modules<_QERArchiveTable>&) + 7689
frame #5: 0x00000001000e0a57 netradiant`QE_InitVFS() + 1351
frame #6: 0x0000000100094673 netradiant`VFSModuleObserver::realise() + 19
frame #7: 0x000000010009478a netradiant`HomePathsModuleObserver::realise() + 58
frame #8: 0x000000010008906a netradiant`EnginePath_Realise() + 58
frame #9: 0x00000001000d3f5f netradiant`Radiant::Radiant() + 351
frame #10: 0x00000001000d15d1 netradiant`Radiant_Construct(ModuleServer&) + 353
frame #11: 0x000000010008a84a netradiant`Radiant_Initialise() + 42
frame #12: 0x0000000100088087 netradiant`main + 535
frame #13: 0x00007fff58e143d5 libdyld.dylib`start + 1
thread #2
frame #0: 0x00007fff58f4abfe libsystem_kernel.dylib`__workq_kernreturn + 10
frame #1: 0x00007fff59007636 libsystem_pthread.dylib`_pthread_wqthread + 458
frame #2: 0x00007fff590073fd libsystem_pthread.dylib`start_wqthread + 13
thread #3
frame #0: 0x00007fff58f4abfe libsystem_kernel.dylib`__workq_kernreturn + 10
frame #1: 0x00007fff59007636 libsystem_pthread.dylib`_pthread_wqthread + 458
frame #2: 0x00007fff590073fd libsystem_pthread.dylib`start_wqthread + 13
thread #4
frame #0: 0x00007fff58f4abfe libsystem_kernel.dylib`__workq_kernreturn + 10
frame #&1: 0x00007fff590076e6 libsystem_pthread.dylib`_pthread_wqthread + 634
frame #2: 0x00007fff590073fd libsystem_pthread.dylib`start_wqthread + 13
```
Thomas Debesse [Tue, 22 Dec 2020 23:27:19 +0000 (23:27 +0000)]
Merge branch 'illwieckz/gtkglext' into 'master'
Make possible to build custom GtkGLExt and build macOS bundle
See merge request xonotic/netradiant!168
Thomas Debesse [Tue, 22 Dec 2020 22:14:58 +0000 (23:14 +0100)]
cmake: minor tweaks
Thomas Debesse [Tue, 22 Dec 2020 22:12:02 +0000 (23:12 +0100)]
macos: produce working NetRadiant.app
Thomas Debesse [Tue, 22 Dec 2020 19:27:09 +0000 (20:27 +0100)]
macos: rename radiant to netradiant
Thomas Debesse [Tue, 22 Dec 2020 17:37:36 +0000 (18:37 +0100)]
bundle: bundle macos binaries (no .app file done yet)
Thomas Debesse [Mon, 21 Dec 2020 16:16:26 +0000 (17:16 +0100)]
tools: update daemonmap submodule
Thomas Debesse [Mon, 21 Dec 2020 16:13:34 +0000 (17:13 +0100)]
tools: no need for minizip/ directory, pkg-config tells it
Thomas Debesse [Mon, 21 Dec 2020 16:12:51 +0000 (17:12 +0100)]
easy-builder: also build builtins, make macos use builtin gtkglext
Thomas Debesse [Tue, 22 Dec 2020 19:08:31 +0000 (20:08 +0100)]
macos: disable drawing xorrectangle (rectangle selection feedback)
disable drawing xorrectangle (rectangle selection feedback)
to workaround crash, selection still works
Thomas Debesse [Mon, 21 Dec 2020 13:34:33 +0000 (14:34 +0100)]
macos: workaround faulty destructor
Thomas Debesse [Mon, 21 Dec 2020 00:47:21 +0000 (01:47 +0100)]
gtkglext: build macos non-x11 gtkglext
Thomas Debesse [Thu, 17 Dec 2020 20:54:29 +0000 (21:54 +0100)]
gtkglext: build and bundle built-in gtkglext
There is a chicken-and-egg problem, so the build must be done in two steps,
First build built-in libraries:
cmake -G "Unix Makefiles" -S. -Bbuild -DBUILTIN_GTKGLEXT=ON -DBUNDLE_LIBRARIES=ON
cmake --build build --parallel $(nproc) -- builtins
Then detect the built-in libraries and build netradiant and install the bundle as usual:
cmake -S. -Bbuild
cmake --build build --parallel $(nproc) install
There is no need to set cmake options on second step but cmake still has to be called again to detect the new files.
Thomas Debesse [Thu, 17 Dec 2020 18:47:59 +0000 (19:47 +0100)]
bundler: detect missing libraries
Thomas Debesse [Tue, 15 Dec 2020 12:21:38 +0000 (13:21 +0100)]
gtkglext: build builtin GtkGLExt as cmake external project
Do:
cmake -G "Unix Makefiles" -S. -Bbuild -DBUILTIN_GTKGLEXT=ON
cmake --build build --parallel $(nproc)
A GtkGLExt tree knonn to build will be downloaded into:
build/gtkglext-prefix/src/gtkglext
and installed into:
build/external
NetRadiant does not build against this builtin GtkGLExt yet.
Thomas Debesse [Wed, 1 Jul 2020 16:20:25 +0000 (18:20 +0200)]
q3map2/light_bounce: prevent infinite loop on obscure bias compute
New code produces same result without loop at all, so
it cannot fall in infinite loop, and it is faster in
use cases requiring more than one loop in previous code.
The Unvanquished vega map is known to trigger the bug:
https://github.com/UnvanquishedAssets/map-vega_src.dpkdir
I reproduced it multiple time on various hardware (8 core FX-9590,
12 core/24 thread Ryzen 9 3900X) with commit
af40508 and using
final compilation profile edited to use -fastbounce instead
of -fast option.
The symptom is simple, q3map2 stucks there:
--- Radiosity (bounce 1 of 8) ---
--- RadCreateDiffuseLights ---
0...1...2...3..
Or somewhere else in that progression bar given your hardware
and the amount of core your CPU has.
When stuck, all the CPU cores are running 100% but the thread
never returns (a strace can reveals it, a gdb backtrace too).
Thanks to @slipher for the precious advices and improving my first
attempt to fix it.
For more information on the issue, I asked:
> which negative value never can become positive
> when incremented infinitely?
slipher said:
> for a double, any value less than -2^53 would have this property
> don't know for float off the top of my head
But then, it means that's theorically verified this loop was able
to run forever in some case.
I don't know what this code is doing anyway, but at least we can
keep the behaviour without requiring to understand it.
Thomas Debesse [Tue, 26 May 2020 15:37:18 +0000 (17:37 +0200)]
Thomas Debesse [Tue, 26 May 2020 15:26:39 +0000 (17:26 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:46:18 +0000 (16:46 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:36:35 +0000 (16:36 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:36:16 +0000 (16:36 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:31:18 +0000 (16:31 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:30:12 +0000 (16:30 +0200)]
revert about dialog image change
Thomas Debesse [Tue, 26 May 2020 14:28:07 +0000 (16:28 +0200)]
revert icon change
Thomas Debesse [Tue, 26 May 2020 14:17:01 +0000 (16:17 +0200)]
Thomas Debesse [Tue, 26 May 2020 14:00:22 +0000 (16:00 +0200)]
Thomas Debesse [Tue, 26 May 2020 13:46:36 +0000 (15:46 +0200)]
Thomas Debesse [Mon, 25 May 2020 23:55:24 +0000 (01:55 +0200)]
fix merge
Thomas Debesse [Mon, 25 May 2020 23:50:50 +0000 (01:50 +0200)]
Thomas Debesse [Mon, 25 May 2020 23:43:55 +0000 (01:43 +0200)]
Thomas Debesse [Mon, 25 May 2020 23:37:54 +0000 (01:37 +0200)]
fix merge
Thomas Debesse [Mon, 25 May 2020 23:37:08 +0000 (01:37 +0200)]
Thomas Debesse [Mon, 25 May 2020 20:32:22 +0000 (22:32 +0200)]
Thomas Debesse [Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)]
Thomas Debesse [Mon, 25 May 2020 19:22:53 +0000 (21:22 +0200)]
Thomas Debesse [Mon, 25 May 2020 19:21:11 +0000 (21:21 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:29:09 +0000 (20:29 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:21:45 +0000 (20:21 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:21:20 +0000 (20:21 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:20:45 +0000 (20:20 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:20:41 +0000 (20:20 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:19:34 +0000 (20:19 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:19:04 +0000 (20:19 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:12:36 +0000 (20:12 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:12:20 +0000 (20:12 +0200)]
Thomas Debesse [Mon, 25 May 2020 18:01:54 +0000 (20:01 +0200)]
Thomas Debesse [Mon, 25 May 2020 17:45:57 +0000 (19:45 +0200)]
csg: add a FIXME to tell the code may be cleaner
Thomas Debesse [Mon, 25 May 2020 17:43:59 +0000 (19:43 +0200)]
Thomas Debesse [Mon, 25 May 2020 17:29:42 +0000 (19:29 +0200)]
Thomas Debesse [Mon, 25 May 2020 15:43:13 +0000 (17:43 +0200)]
fix merge
Thomas Debesse [Mon, 25 May 2020 14:44:53 +0000 (16:44 +0200)]
Thomas Debesse [Mon, 25 May 2020 14:35:34 +0000 (16:35 +0200)]
Thomas Debesse [Mon, 25 May 2020 12:53:10 +0000 (14:53 +0200)]
global.xlink: remove Blendmode cheatsheet link
Thomas Debesse [Mon, 25 May 2020 12:51:04 +0000 (14:51 +0200)]
import Blendmodes_cheatsheet.jpg
who is author? what is license?
Thomas Debesse [Mon, 25 May 2020 12:44:55 +0000 (14:44 +0200)]
Makefile: disable meshtex plugin compilation (does not build)
Not configured in CMakeList.txt yet