55 Commits

Author SHA1 Message Date
MoNTE48
824515ebed Backport 'Underwater plantlike drawtype' https://github.com/minetest/minetest/pull/5748 2019-10-11 14:28:30 +02:00
MoNTE48
e98d421aff Merge remote-tracking branch 'upstream/stable-0.4' into sync 2019-04-01 20:18:54 +02:00
stujones11
a61050e6cf Include TILE_MATERIAL_OPAQUE in shaders header (#6086) 2018-06-03 17:31:59 +02:00
stujones11
aca9494500 Tile material: Add 'TILE_MATERIAL_OPAQUE', use for drawtype 'NDT_NORMAL'
Prevents normal drawtype nodes having transparency.
Avoids clients cheating by using 'x-ray' texture packs with transparent textures.
2018-06-03 17:31:59 +02:00
Maksim Gamarnik
35770f4abb Merge Minetest 0.4.16 2017-06-06 23:03:34 +03:00
Loïc Blot
db34330121 Fix various variables passed by copy instead of const ref (#5610)
Pointed by cppcheck
2017-04-19 00:36:30 +02:00
Maksim Gamarnik
e05f7db82f Updated to Minetest ver. 0.4.15 2017-01-30 00:44:07 +02:00
Dániel Juhász
d5a0b5283e Add hardware node coloring. Includes:
- Increase ContentFeatures serialization version
- Color property and palettes for nodes
- paramtype2 = "color", "colored facedir" or "colored wallmounted"
2017-01-23 07:27:12 +01:00
Lars Hofhansl
ef6e0d1a52 Fog: Make fraction of visible distance at which fog starts configurable
Optimise the fetching of global settings 'camera_smoothing',
'cinematic' and 'cinematic_camera_smoothing'.
Cache 'cam_smoothing'.
2016-12-07 04:07:54 +00:00
Zeno-
e1f379b11b No functional changes. Credit gcu
This merge doesn't make any functional changes. It's a trivial style fix so that @gregorycu can be dual credited along with shadowninja for PR #4800
2016-11-23 01:23:34 +10:00
ShadowNinja
ca62998bfd Fix superflous shader setting updates (#4800)
This improves rendering performance by ~40%
2016-11-23 00:05:39 +10:00
lhofhansl
fec859fe92 Remove unused shader matrices. (#4723) 2016-11-04 18:12:45 +01:00
Maksim Gamarnik
f56e578960 Merge remote-tracking branch 'upstream1/master' 2016-03-21 01:45:56 +02:00
ShadowNinja
3592feb875 Clean up Strfnd
Changes:
  * Fix indentation.
  * Pass strings by const reference.
  * Merge Strfnd and WStrfnd into one class instead of copying them.
  * Remove trailing spaces.
  * Fix variable names.
  * Move to util.
  * Other miscellaneous style fixes.
2016-03-19 21:27:57 -04:00
Maksim Gamarnik
d7c0fad71f Merge Minetest commits 2016-02-11 22:35:23 +02:00
RealBadAngel
0571768c30 Set proper GLSL pixel shader version 2016-02-11 09:47:25 +01:00
RealBadAngel
8a15583fd7 Dump shader programs on compile errors 2016-02-11 07:13:07 +01:00
Loic Blot
79e6d472b3 Fix inverted conditions in shader.cpp 2016-02-09 23:50:37 +01:00
Loic Blot
0c383ed270 shader.cpp: don't test twice if shader programs are present
Also use string::empty method, it is better than comparing with empty strings.
2016-02-09 23:19:19 +01:00
RealBadAngel
ead025fb02 Filmic HDR tone mapping 2016-02-09 02:55:59 -05:00
Maksim Gamarnik
919be490f9 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
kwolekr
5b30bbcc23 Refactor thread utility interface
- Add "thr_" prefix to thread utility functions
- Compare threadid_ts in a portable manner, where possible
2015-10-16 22:20:24 -04:00
David Jones
9d1284b324 Change i++ to ++i 2015-08-25 18:33:52 -04:00
ShadowNinja
098d28aa5e Clean up threading
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
2015-08-23 22:04:06 -04:00
Maksim Gamarnik
9247f32e0e LGPL 2.1 to 3.0 on all files 2015-08-14 01:26:28 +03:00
RealBadAngel
f60b0bd911 Shaders fixes and cleanup relief mapping code. 2015-07-02 21:36:45 +02:00
RealBadAngel
a111a5fbcf Improved parallax mapping. Generate heightmaps on the fly. 2015-06-14 21:13:36 +02:00
kwolekr
a8e64001ff Replace instances of std::map<std::string, std::string> with StringMap
Also, clean up surrounding code style
Replace by-value parameter passing with const refs when possible
Fix post-increment of iterators
2015-05-31 23:21:19 +10:00
kwolekr
4df33b90e5 Replace instances of std::map<std::string, std::string> with StringMap
Also, clean up surrounding code style
Replace by-value parameter passing with const refs when possible
Fix post-increment of iterators
2015-05-19 16:10:49 -04:00
Craig Robbins
0731f9ed2a Move globals from main.cpp to more sane locations
Move debug streams to log.cpp|h

Move GUI-related globals to clientlauncher

Move g_settings and g_settings_path to settings.cpp|h

Move g_menuclouds to clouds.cpp|h

Move g_profiler to profiler.cpp|h
2015-04-01 23:04:25 +10:00
Craig Robbins
27791ee1aa For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives 2015-03-07 22:41:47 +10:00
Loic Blot
188c15c3d8 Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/ 2015-03-05 11:59:40 +01:00
BlockMen
e25777936f Add optional framed glasslike drawtype 2014-10-02 11:35:15 +02:00
TriBlade9
2d6eb3d2f3 Add firelike drawtype 2014-09-21 15:50:27 -04:00
sfan5
34a3e2d5fa Fix warnings reported by clang 2014-07-06 13:19:21 +02:00
sapier
8fd4c96588 Fix memory leaks in GenericCAO, ShaderSource and Player classes 2014-07-02 23:33:18 +02:00
RealBadAngel
068b1ca61d Unite nodes shaders.
Pass drawtype and material type to shaders.
Move shaders generation to startup only.
Allow assign shaders per tile.
Initial code to support water surface shader.
2014-06-15 05:40:33 +02:00
Sfan5
3f90a81374 Fix all warnings reported by clang 2014-04-15 21:34:53 +02:00
RealBadAngel
9cf4f96fa7 Normal maps generation on the fly.
Parallax mapping with slope information.
Overriding normal maps.
2014-03-21 01:32:00 +01:00
sapier
f04d2ad9e3 Make MutexQueue use jsemaphore for signaling 2014-01-10 10:10:45 +01:00
RealBadAngel
9d6015b41d Optimize shaders code. Add settings at compile time. 2013-12-09 13:28:50 +01:00
Novatux
d1f08635ac Fix shaders on some GPUs 2013-12-08 08:01:20 +01:00
sapier
396602432c Cleanup jthread and fix win32 build 2013-12-01 16:25:46 +01:00
sapier
4aa8a5c636 Fix Result of processed Request was written to invalid (non existent) ResultQueue if requesting thread timed out before 2013-11-17 12:46:54 -05:00
sapier
78cc469411 Fix multicaller support in RequestQueue 2013-11-17 12:45:58 -05:00
PilzAdam
aa0b76636f Settings: everything != 0 equals true; remove .asm shaders 2013-07-08 01:58:49 +02:00
sapier
4f7abcbafa Fix many formspec menu bugs 2013-07-07 19:49:52 -04:00
Kahrl
256eb4a122 Don't rebuild the dummy shader (less SourceShaderCache warning spam)
Also write something about rebuilding shaders to infostream in
Client::afterContentReceived()
2013-07-05 04:24:05 +02:00
Brent Hull
7aae7d792f Fix shader license headers to be LGPL 2013-05-06 19:09:08 +02:00
sapier
d116d1b779 fix memory leak on shader shutdown 2013-04-07 22:30:29 -04:00