From 0aebb5afa757be3a86ea92afe9e51bac543c71ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Tue, 1 May 2012 10:43:33 +0000 Subject: [PATCH] paysages : Small texture fix. git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@314 b1fd45b6-86a6-48da-8261-f70d1f35bdcc --- ChangeLog | 3 +++ TODO | 5 +++-- gui_qt/mainwindow.cpp | 2 +- i18n/paysages_fr.ts | 1 + lib_paysages/textures.c | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36adc98..d983521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ????-??-?? Technology Preview 2 ------------------------------- * Previews scaling is now logarithmic (slower when zoomed). +* Previews drawing now takes advantage of multiple CPUs. +* New displacement mode for textures (perpendicular to local ground surface). +* Added clouds hardness to light. 2012-04-20 Technology Preview 1 ------------------------------- diff --git a/TODO b/TODO index 04b1189..301ceb7 100644 --- a/TODO +++ b/TODO @@ -10,11 +10,11 @@ Technology Preview 2 : - Add a noise filler (and maybe noise intervals ?). - Improve curve editor. - Water and terrain LOD moves with the camera, fix it like in the wanderer. -- There should not have to be more preview threads than core. -- Handle preview threads termination. +- There should not have to be more preview threads than cpu cores. - Add preview threads pausing (for rendering). - Add preview chunks priority (for visible previews). - Interrupt preview chunk renderings that will be discarded at commit. +- Can't overwrite picture files (ILError). Technology Preview 3 : - Restore render progress. @@ -23,6 +23,7 @@ Technology Preview 3 : - Improve sky rendering (colors and light halo). - Add a progress indicator on previews. - Multi threaded first pass. +- Fix potential holes in land rendering. Release Candidate : - Polish all features and UI. diff --git a/gui_qt/mainwindow.cpp b/gui_qt/mainwindow.cpp index 833dd9a..679faa9 100644 --- a/gui_qt/mainwindow.cpp +++ b/gui_qt/mainwindow.cpp @@ -205,7 +205,7 @@ void MainWindow::fileLoad() void MainWindow::showAboutDialog() { - QMessageBox::about(this, tr("Paysages 3D"), tr("A 3D landscape editing and rendering software.\n\nAuthors :\nProgramming - Michael Lemaire\n\nQt - http://qt.nokia.com/\nDevIL - http://openil.sourceforge.net/\nGLib - http://www.gtk.org/\n")); + QMessageBox::about(this, tr("Paysages 3D"), tr("A 3D landscape editing and rendering software.\n\nAuthors :\nProgramming - Michael Lemaire\n\nCredits :\nQt - http://qt.nokia.com/\nDevIL - http://openil.sourceforge.net/\nGLib - http://www.gtk.org/\n")); } void MainWindow::quickPreview() diff --git a/i18n/paysages_fr.ts b/i18n/paysages_fr.ts index 235e797..6338424 100644 --- a/i18n/paysages_fr.ts +++ b/i18n/paysages_fr.ts @@ -847,6 +847,7 @@ rapide (F5) Authors : Programming - Michael Lemaire +Credits : Qt - http://qt.nokia.com/ DevIL - http://openil.sourceforge.net/ GLib - http://www.gtk.org/ diff --git a/lib_paysages/textures.c b/lib_paysages/textures.c index 83b34fb..72bcb72 100644 --- a/lib_paysages/textures.c +++ b/lib_paysages/textures.c @@ -216,7 +216,7 @@ static inline Vector3 _getPreNormal(TextureLayerDefinition* definition, Renderer dpoint.y = renderer->getTerrainHeight(renderer, dpoint.x, dpoint.z); ref.x = 0.0; ref.z = 1.0; - normal = v3Add(normal, v3Normalize(v3Cross(ref, v3Sub(dpoint, point)))); + normal = v3Normalize(v3Cross(ref, v3Sub(dpoint, point))); dpoint.x = point.x; dpoint.z = point.z + scale; @@ -239,7 +239,7 @@ static inline Vector3 _getPreNormal(TextureLayerDefinition* definition, Renderer dpoint.y = renderer->getTerrainHeight(renderer, dpoint.x, dpoint.z); ref.x = 0.0; ref.z = -1.0; - normal = v3Normalize(v3Cross(ref, v3Sub(dpoint, point))); + normal = v3Add(normal, v3Normalize(v3Cross(ref, v3Sub(dpoint, point)))); } return v3Normalize(normal);