Daniel Butum
244c812cf3
Add travis server only matrix configuration ( #2682 )
...
Also increase number of threads for the gcc builds
2016-12-11 19:15:37 -05:00
hiker
8785ddf148
Moved force-fog settings into track.
2016-12-12 08:05:07 +11:00
Benau
4327885f07
Add alpha test skinned mesh instanced shaders
2016-12-12 01:00:57 +08:00
Benau
e9b68a8a1f
Use a non-hardcoded values for mat4 array (max 1024)
...
Also cull mesh that doesn't have enough space to be rendered
2016-12-11 15:50:53 +08:00
Benau
f6490b6fa6
Allow array to capture lambada
...
Also use a correct sorting function, will be useful later if
we only need the more influetial bones.
2016-12-11 13:21:17 +08:00
Benau
ceef7495d2
Enable culling for animated mesh
...
Use the first frame bounding box for it, don't update each frame
2016-12-11 11:01:02 +08:00
Benau
fcd1e2830e
Use callback function to directly upload joints without copying
2016-12-10 16:16:40 +08:00
Benau
8ca0c54bdc
Merge remote-tracking branch 'origin/master' into hardware_skinning
2016-12-10 10:09:30 +08:00
samuncle
ae0b1136f5
better shader for underwater vegetation
2016-12-09 11:38:56 -05:00
Benau
c68492f42b
Use a for loop for four bones (thanks leyyin suggestion!)
2016-12-09 23:21:41 +08:00
Benau
94f6d09bf5
Allow indirect and azdo shadow rendering for skinned mesh
2016-12-09 22:37:17 +08:00
Benau
f2422317ba
Auto fallback to software skinning if not supported
...
Currently explicit attribute location, uniform buffer object and
opengl greater or equal 3.3 are required for hardware skinning
So even intel hd3000 in linux can do hardware skinning
2016-12-09 20:50:09 +08:00
Benau
76e070b709
Allow GL3 to have hardware skinning
2016-12-09 18:41:13 +08:00
Benau
b7e047b4c1
Avoid using else if in skinning vertex shader
2016-12-09 14:16:30 +08:00
hiker
22092e6459
Moved background/clear color from world to irr_driver.
2016-12-09 17:14:04 +11:00
Benau
21d9117b2d
Fix matrix4 pointer in windows
...
Also allow minimum azdo rendering and avoid skinning empty joints
2016-12-08 16:12:54 +08:00
hiker
dbfaf2105b
Merge remote-tracking branch 'origin/master' into nw
2016-12-08 13:36:36 +11:00
hiker
fed12f774c
Fixed potential deadlock, made debug output more useful.
2016-12-08 09:46:44 +11:00
Benau
407ed319de
Show debug info about total skinning joints being calculated
2016-12-07 16:26:22 +08:00
Benau
d21e5e0f76
Make skinning offset changeable by culling
2016-12-07 16:08:57 +08:00
Benau
fcebb5c2e6
Fix crash with normal map skinned mesh
2016-12-07 09:29:40 +08:00
Benau
ac8d7aa8c7
Try to fix the build
2016-12-07 08:18:19 +08:00
Benau
a3905a1e19
Allow tangent mesh to be converted
2016-12-07 08:07:01 +08:00
Deve
66f57ada61
Fixed a crash when GLES device is re-created
2016-12-07 00:08:16 +01:00
hiker
32daf4ce29
Removed unused functions.
2016-12-07 09:34:33 +11:00
Deve
5fad8a135e
Destroy egl context on exit
2016-12-06 23:32:04 +01:00
Deve
c013fcea61
Allow to log messages to file on android
2016-12-06 23:31:49 +01:00
Benau
57d9e83ed4
First version of hardware skinning
...
Todo: shadow, non-instanced shaders, culling, changeable offset...
2016-12-07 02:15:11 +08:00
hiker
95e627c004
Fixed pi compilation.
2016-12-07 00:28:36 +11:00
hiker
63fe4373a8
Removed unnecessary #ifdef.
2016-12-06 21:50:23 +11:00
hiker
8b806dd35a
Fixed compiler warnings.
2016-12-06 18:46:03 +11:00
hiker
1939075a1b
Merge remote-tracking branch 'origin/master' into nw
2016-12-06 18:45:17 +11:00
hiker
fdfb56ddf8
Fix server-only compilation.
2016-12-06 18:10:31 +11:00
hiker
746bac00ce
Merge remote-tracking branch 'origin/new-pi' into nw
2016-12-06 09:26:07 +11:00
hiker
526b2a8f0d
Added two more graph connections.
2016-12-06 09:22:13 +11:00
hiker
79ad569542
Only allow LAN connections for LAN servers (previously anyone with
...
the IP address could connect, even from the outside). Added new
--public-server command line option to enable public WAN server.
2016-12-06 09:10:05 +11:00
Deve
23883b83c1
Fixed a crash on startup.
...
As written in the documentation: "The returned modifiers string is owned by Xlib and should not be modified or freed by the client."
2016-12-04 23:23:09 +01:00
Deve
c0cd915716
Minor fixes in file manager.
...
The listFiles function returns absolute paths, so the condition if ((*i)=="..") doesn't have a sense. I added a check for absolute paths (file == name + "/.."). Btw. what about Windows? Does it return 'name + "\\.." ' or so?
I also enabled recursive removing of directories on Android. It is needed for example when you have already installed STK with extracted data files, and then you want to upgrade STK to newer version.
2016-12-04 22:22:42 +01:00
Deve
419e9e5351
Some minor modifications that make merging with master easier
2016-12-04 15:11:48 +01:00
Benau
2c8b31379b
Don't push color info for shadow and rsm
2016-12-04 13:41:28 +08:00
Benau
ed43d16a1c
Allow alpha test shader to be colorizable
2016-12-04 13:21:39 +08:00
Benau
2a50149e62
Remove TODOs about splatting
...
Splatting will be drawn using non-instanced shader only, it's only
used one place (in overworld) and may be removed eventually
2016-12-04 11:48:52 +08:00
Benau
902f4e20a5
Leave the loop as soon as one material is colorizable
2016-12-04 11:15:32 +08:00
Benau
2d980264b4
Update LOD to support colorization
2016-12-04 10:47:08 +08:00
Benau
7d5f786da8
Make grass shader colorizable
2016-12-04 00:59:09 +08:00
Benau
31b6a0a4b1
Try to fix gcc build
2016-12-03 16:06:46 +08:00
Benau
4261a96d06
Fix inconsistency between grass shader and the instanced version
...
1. Assign the missing depth stencil texture (dtex)
2. Correct the movement and color
2016-12-03 15:54:59 +08:00
Benau
79136e0289
Fix GLES
2016-12-03 14:10:07 +08:00
Benau
332811af84
Merge branch 'improve_instanced_rendering'
2016-12-03 09:17:15 +08:00
Benau
6a3ad6605b
Try to fix release build
2016-12-02 21:00:34 +08:00
