Commit graph

365 commits

Author SHA1 Message Date
Michaël Lemaire eb795b0f83 Added camera FOV control (and better initial fov) 2013-12-30 14:59:42 +01:00
Michaël Lemaire 134158c33a Stars optimization and small tweaks 2013-12-29 18:44:12 +01:00
Michaël Lemaire 220fe89b05 Use the new terrain walker for improved shadows 2013-12-29 18:18:18 +01:00
Michaël Lemaire eabe68b77d New terrain walker (now used for ray casting) 2013-12-29 14:14:49 +01:00
Michaël Lemaire 938242a7de Optimization for moon lighting 2013-12-26 19:03:19 +01:00
Michaël Lemaire 0e837f00c6 Added lighting done by moon 2013-12-26 18:28:25 +01:00
Michaël Lemaire 3786b21e15 Added stars to night sky 2013-12-26 17:30:22 +01:00
Michaël Lemaire c651b436ab Added moon configuration 2013-12-26 16:55:37 +01:00
Michaël Lemaire d2f49a124f Added moon basic lighting 2013-12-26 16:35:29 +01:00
Michaël Lemaire 6589589ad4 Added basic night sky with a plain moon 2013-12-26 15:36:15 +01:00
Michaël Lemaire 0ebdff628b More realistic water presets 2013-12-25 19:55:05 +01:00
Michaël Lemaire a9a6134633 Fixed material dialog validation and made material hardness to work 2013-12-25 19:45:56 +01:00
Michaël Lemaire 5c253081a0 Made bruneton source code dump intermediary textures
... but they produce more artifacts than my modified version,
so it's not immediately usable.
2013-12-25 18:01:44 +01:00
Michaël Lemaire 19d4c3444f Added bruneton original source code for atmospheric scattering 2013-12-25 16:42:56 +01:00
Michaël Lemaire de79f912c3 Moved small things from WidgetExplorer to OpenGLRenderer 2013-12-24 16:36:45 +01:00
Michaël Lemaire 742b93d3d9 Small fixes to opengl rendering 2013-12-24 15:00:32 +01:00
Michaël Lemaire 806ab74244 Fixed camera definition to avoid going underground in opengl view 2013-12-24 13:30:32 +01:00
Michaël Lemaire 3d54ce974a Added view distance blending in opengl renderer 2013-12-24 13:22:34 +01:00
Michaël Lemaire 74e707a989 Fixed water color in opengl rendering 2013-12-24 11:48:06 +01:00
Michaël Lemaire bf47e058ee Rendering terrain chunks with new shader system 2013-12-24 11:44:39 +01:00
Michaël Lemaire f97823604e Introduced VertexArray object to handle terrain vertex data
This will be used later with opengl vertex arrays
2013-12-23 17:24:05 +01:00
Michaël Lemaire ac5c0fd584 Refactored opengl terrain rendering for future use of shaders 2013-12-23 14:09:52 +01:00
Michaël Lemaire 8098482d50 Retrograded to OpenGL 3.0 functions 2013-12-23 10:26:29 +01:00
Michaël Lemaire 39789aea3f Allow shaders source code to be split in several files (and thus included) 2013-12-22 18:47:24 +01:00
Michaël Lemaire 992089f0ef Added textures to OpenGLSharedState 2013-12-22 18:05:11 +01:00
Michaël Lemaire 645bada91b Added camera to OpenGLSharedState 2013-12-22 17:30:48 +01:00
Michaël Lemaire 666420bbb2 New OpenGLSharedState class to manage shader variables 2013-12-22 15:04:33 +01:00
Michaël Lemaire 994dcb5f44 Add aerial perspective to water shader 2013-12-22 01:17:57 +01:00
Michaël Lemaire 3696adc90b Use opengl shaders for water rendering 2013-12-22 00:41:19 +01:00
Michaël Lemaire 65e5a194ba Use QOpenGLFunctions for gl* calls (except legacy code) 2013-12-22 00:10:18 +01:00
Michaël Lemaire 7b790d2015 Switched opengl skybox to shaders 2013-12-21 23:48:54 +01:00
Michaël Lemaire c497cf2127 Restored clouds aspect preview 2013-12-20 17:30:27 +01:00
Michaël Lemaire 1d9f622a26 Small cloud adjustments 2013-12-19 18:19:18 +01:00
Michaël Lemaire 5f8cd19e0c Fixed preview updates drawing outside pixbuf on resize 2013-12-19 15:22:49 +01:00
Michaël Lemaire a3d2150349 Restored clouds rendering 2013-12-18 22:09:35 +01:00
Michaël Lemaire 3271b7ed5e WIP on restoring clouds rendering 2013-12-17 23:45:09 +01:00
Michaël Lemaire 192aa7604e Fixed several minor memory race bugs 2013-12-17 23:01:36 +01:00
Michaël Lemaire 97b9992aa4 Small optimization 2013-12-15 19:03:57 +01:00
Michaël Lemaire 6b5a652d5c Fixed several renderer problems due to scenery sharing 2013-12-15 18:44:54 +01:00
Michaël Lemaire cc9c68bef9 Fixed layers not adding children to BaseDefinition 2013-12-15 15:33:54 +01:00
Michaël Lemaire bd29ee97cf Fixed top-down preview and opengl renderer 2013-12-15 15:18:11 +01:00
Michaël Lemaire 1685efcfbe Fixed opengl explorer 2013-12-15 15:06:43 +01:00
Michaël Lemaire 02bf40c3c6 Fixed top-down render preview 2013-12-15 14:50:43 +01:00
Michaël Lemaire a814a530de Fixed rendering camera not being applied 2013-12-15 14:45:38 +01:00
Michaël Lemaire 7cda1efa54 Fixed water previews 2013-12-15 14:41:38 +01:00
Michaël Lemaire 97a950947a Fixed terrain preview 2013-12-15 14:28:46 +01:00
Michaël Lemaire 00e04df25a Fixed atmosphere previews 2013-12-15 13:59:21 +01:00
Michaël Lemaire be5c67e4aa Several speed optimizations 2013-12-11 12:46:39 +01:00
Michaël Lemaire a59d8f2cc6 Add a test for scanlines cutting 2013-12-11 11:46:17 +01:00
Michaël Lemaire 879f88fd20 Removed old C-api for Vector3 2013-12-11 11:32:10 +01:00
Michaël Lemaire 88517af86f Removed old C-Api from Color 2013-12-11 10:24:35 +01:00
Michaël Lemaire 84608a66a8 Fully removed 'rendering' library 2013-12-11 10:17:36 +01:00
Michaël Lemaire 5354087244 Optimized camera projection and scanlines 2013-12-10 23:41:33 +01:00
Michaël Lemaire 09c6ce6e58 Fixed explorer and renderer 2013-12-10 23:06:57 +01:00
Michaël Lemaire 19ac6936b0 Refactored RenderingScenery and STL containers usage 2013-12-10 22:32:58 +01:00
Michaël Lemaire 2aed1f07ae [Broken WIP] Refactored textures, pictures and cache 2013-12-09 22:16:00 +01:00
Michaël Lemaire ec444b7c26 [Broken WIP] Removed legacy Renderer and refactored RenderArea. 2013-12-09 11:59:57 +01:00
Michaël Lemaire 74634dfaf1 [Broken WIP] Refactoring terrain, textures and water renderer 2013-12-08 20:54:34 +01:00
Michaël Lemaire b0d9ead01d [WIP] Removed old atmosphere renderer 2013-12-08 18:40:16 +01:00
Michaël Lemaire fca6f4c96e [WIP] Refactoring lighting 2013-12-08 18:40:16 +01:00
Michaël Lemaire 50d499d10f Refactored water rasterizer 2013-12-08 18:05:18 +01:00
Michaël Lemaire 6bb03c5957 Fixed using a deleted header 2013-12-08 17:57:56 +01:00
Michaël Lemaire 0afeb7707d Refactored TerrainRasterized 2013-12-05 16:44:18 +01:00
Michaël Lemaire e32738564b Added alterLight to cloudsRenderer (not used yet) + fixed clouds ui 2013-12-04 23:28:34 +01:00
Michaël Lemaire 9be090b1ff WIP on new clouds renderer 2013-12-04 22:52:18 +01:00
Michaël Lemaire ff27afe675 Refactored cloud renderer (currently not working correctly) 2013-12-01 19:24:53 +01:00
Michaël Lemaire 7fecdba313 Restored choice and toggles working on preview renderers 2013-11-30 18:06:41 +01:00
Michaël Lemaire 684a64158c Fixed and refactored terrain preview 2013-11-30 11:54:27 +01:00
Michaël Lemaire 79080c756f Removed old euclid.h/c 2013-11-20 17:09:55 +01:00
Michaël Lemaire 4c49e2e757 Removed unused OpenCL 2013-11-20 17:01:49 +01:00
Michaël Lemaire 7fd79672be Refactored water previews 2013-11-20 13:06:16 +01:00
Michaël Lemaire ee094d9b18 Refactored atmosphere previews 2013-11-20 11:27:21 +01:00
Michaël Lemaire ee78af05d5 Refactored cloud previews 2013-11-19 23:46:37 +01:00
Michaël Lemaire 532685f7cb Removed unused memory.h/c 2013-11-19 16:04:16 +01:00
Michaël Lemaire 8a42d7407a Removed unused ColorGradation + removed old color.h/c 2013-11-19 12:59:06 +01:00
Michaël Lemaire a108682b4d Refactored ColorProfile 2013-11-19 12:51:26 +01:00
Michaël Lemaire 82defc96f6 Removed old tools.h/c 2013-11-19 12:16:33 +01:00
Michaël Lemaire 051766d1d5 Fixed top-down render preview in render form 2013-11-17 23:33:46 +01:00
Michaël Lemaire 6436428eeb Removed UNUSED() macro and simplified some headers 2013-11-17 23:02:36 +01:00
Michaël Lemaire 0ae9fe94b2 Fixed atmosphere previews not using the correct camera 2013-11-17 22:51:06 +01:00
Michaël Lemaire 541f1e065f Fixed layer names not being saved/loaded or copied 2013-11-17 22:47:27 +01:00
Michaël Lemaire 9e6838f733 TerrainDefinition and Scenery refactoring 2013-11-17 22:36:18 +01:00
Michaël Lemaire fa5c0041af Refactored TexturesDefinition, getting rid of legacy layers 2013-11-16 19:12:42 +01:00
Michaël Lemaire 5506158363 Fixed camera above ground checking in opengl renderer 2013-11-16 00:39:17 +01:00
Michaël Lemaire 4f9e24b87d Refactored AtmosphereDefinition 2013-11-16 00:27:40 +01:00
Michaël Lemaire 1cccae90be Refactored CloudsDefinition 2013-11-15 23:26:44 +01:00
Michaël Lemaire dc679500fa Renaming editing -> interface/desktop 2013-11-14 21:46:47 +01:00
Michaël Lemaire c1fd52b0db Ensure camera is above ground and water 2013-11-14 21:05:12 +01:00
Michaël Lemaire 2df3c90ffd Refactored Matrix4 and CameraDefinition 2013-11-14 18:47:03 +01:00
Michaël Lemaire 67105775b6 The default scenery for a SoftwareRenderer is now a default scenery (not the global one) 2013-11-13 23:36:52 +01:00
Michaël Lemaire cdd9ef26a2 Removed Scenery C-API and fixed some problems 2013-11-13 23:03:02 +01:00
Michaël Lemaire 5be3231ab9 Refactoring color 2013-11-13 20:07:35 +01:00
Michaël Lemaire aed4f9d80e Refactoring of BasePreview 2013-11-12 23:15:35 +01:00
Michaël Lemaire d9f2f3878f Big WIP refactoring (preview + atmosphere renderer) 2013-11-12 21:34:35 +01:00
Michaël Lemaire dcc36990b7 Merge branch 'fluid_traversal' 2013-11-11 15:43:13 +01:00
Michaël Lemaire f1a13516c9 Freeze and disable fluid medium traversal, for master merge of progress 2013-11-11 15:42:11 +01:00
Michaël Lemaire 5054d3583d Refactored Vector3 to class 2013-11-11 13:56:39 +01:00
Michaël Lemaire 3652333b36 Removed old 'testing' directory 2013-11-10 21:21:55 +01:00
Michaël Lemaire ea8f7f6fb1 Merge branch 'master' into fluid_traversal
Conflicts:
	Makefile
2013-11-10 21:18:32 +01:00
Michaël Lemaire 0627603f5a Using googletest instead of cppunit 2013-11-10 21:14:10 +01:00
Michaël Lemaire 4a39eda2dc WIP on fluid medium traversal 2013-11-10 17:04:38 +01:00
Michaël Lemaire 8051719f9f WIP on restoring unit tests on cppunit 2013-11-10 17:03:07 +01:00
Michaël Lemaire 0edd90c477 WIP on fluid medium traversal 2013-11-09 19:13:28 +01:00
Michaël Lemaire 6835db2aca Small makefile correction 2013-11-09 19:00:14 +01:00
Michaël Lemaire a48213453a Ajout de common.pri 2013-11-09 18:56:56 +01:00
Michaël Lemaire e9751a0e0b WIP on fluid medium traversal 2013-11-09 18:46:34 +01:00
Michaël Lemaire 5c2bc4b31e Refactoring for c++ 2013-11-07 09:37:11 +01:00
Michaël Lemaire cf75e86be6 Extracted opengl "explorer" in render/opengl library 2013-11-05 11:45:26 +01:00
Michaël Lemaire b5c50d16d4 Made a class of NoiseGenerator 2013-11-03 15:46:39 +01:00
Michaël Lemaire 1a69b1de1d Removed C-API from 'system' 2013-11-03 13:00:31 +01:00
Michaël Lemaire abd463d29d Switched rendering lib to c++ compiling
This will allow to avoid #if __cplusplus directives, and C-apis.
2013-11-02 16:43:43 +01:00
Michaël Lemaire d2620ae2e3 Fixed problems with new c++ layers 2013-11-01 00:09:51 +01:00
Michaël Lemaire ca0f87b419 Started adding cppunit tests 2013-10-31 22:53:22 +01:00
Michaël Lemaire 5dfa34dd56 WIP on c++ layers 2013-10-31 17:59:18 +01:00
Michaël Lemaire 8b9c3b2de1 Fixed some compilation issues 2013-10-30 15:39:56 +01:00
Michaël Lemaire b789e3879d Rewritten PackStream in C++, using Qt serialization 2013-10-30 12:46:18 +01:00
Michaël Lemaire 00cbc7f424 Fixed a problem with direct scenery access in C-API 2013-10-29 21:38:27 +01:00
Michaël Lemaire ce56f0a985 New Scenery class, with transitional C-api 2013-10-29 21:28:59 +01:00
Michaël Lemaire ea25cdaa55 Removed system.h and system.c (replaced by System class) 2013-10-26 23:19:49 +02:00
Michaël Lemaire e82e0c47bd Added win32 DLL support everywhere
Build is now entirely possible from a fresh QtSDK install,
with no external dependency.
2013-10-20 16:47:59 +02:00
Michaël Lemaire 6ab664485a Win32 DLL support for libpaysages_system 2013-10-20 15:24:58 +02:00
Michaël Lemaire ad1a492884 Removed dependency to GLib/GThread 2013-10-20 15:07:12 +02:00
Michaël Lemaire 25d14a43ce Replaced glib mutex by QMutex 2013-10-20 15:01:57 +02:00
Michaël Lemaire 4ee1c4f7e1 Threading now uses QThread instead of glib threads 2013-10-20 14:53:53 +02:00
Michaël Lemaire b896832e76 Removed dependency to OpenIL/libDevIL 2013-10-20 14:34:55 +02:00
Michaël Lemaire 5032f1b2aa Correction des config qmake 2013-10-16 17:09:20 +02:00
Michaël Lemaire 46f34eb23c Small cloud preview improvement 2013-10-08 10:13:51 +02:00
Michaël Lemaire f4e4c1def4 Simplified qmake usage and normalized build between make and qtcreator 2013-10-06 23:04:04 +02:00
Michaël Lemaire f39c4b3f6c Temporary fix for preview renders stopping when window loses focus 2013-10-06 15:45:53 +02:00
Michaël Lemaire 29d258574a Fixed terrain preview not clearing base texture zone 2013-10-03 23:31:23 +02:00
Michaël Lemaire 23cad30548 Started textures edition dialog (WIP) 2013-10-03 23:28:30 +02:00
Michaël Lemaire a7bc90a1a1 Fixed compile warning (regarding static members initialization) 2013-10-03 23:28:09 +02:00
Michaël Lemaire 81a27b1b39 Tweaked textures presets 2013-10-03 23:27:37 +02:00
Michaël Lemaire 7ea28826bb Fixed terrain preview not using specified material 2013-10-02 22:00:08 +02:00
Michaël Lemaire 7f0a13c02b Zone height ranges can now be relative to terrain and water height 2013-09-27 23:28:06 +02:00
Michaël Lemaire be19d1d759 Moved zone.h and zone.c to tools 2013-09-27 22:06:00 +02:00
Michaël Lemaire 8d701e910b Small include fixes and unused variable tagging 2013-09-27 22:04:05 +02:00
Michaël Lemaire f1e2c17f2e Merge branch 'master' of ssh://bitbucket.org/thunderk/paysages 2013-09-26 22:12:34 +02:00
Michaël Lemaire c6be386a59 Switch to HSL color space for material definition 2013-09-18 17:10:34 +02:00
Michaël Lemaire 05c0a58875 Separated texture layer results for previews 2013-08-28 16:03:22 +02:00
Michaël Lemaire 7cd74b2c8a WIP on texture previews 2013-08-24 00:51:27 +02:00
Michaël Lemaire 2c79175304 Header chain optimization 2013-08-24 00:50:56 +02:00
Michaël Lemaire 4d8a1fe5cf Fixed build system (now working from cli and qteditor) 2013-08-24 00:50:12 +02:00
Michaël Lemaire 02e839406c Factorized common qmake parts 2013-08-23 22:57:34 +02:00
Michaël Lemaire 08d7b56f00 Switching all build system to qmake 2013-08-23 20:29:54 +02:00
Michaël Lemaire c46afa4152 Added presets to FreeFormHelper + small fixes 2013-08-21 23:22:13 +02:00
Michaël Lemaire 171df529fa Added layer coverage preview on new textures form 2013-08-21 23:19:47 +02:00
Michaël Lemaire 08b481df7d WIP on new material dialog 2013-08-18 17:13:15 +02:00
Michaël Lemaire bc3f47e3b9 Added rounded drawing widgets 2013-08-18 17:12:54 +02:00
Michaël Lemaire f199963867 Several fixes and small changes 2013-08-17 18:08:37 +02:00