graphics/paysages3d
1
0
Fork 0
Code Releases Activity

paysages: Fixed terrain shadows.

Browse source 
git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@245 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
This commit is contained in:
Michaël Lemaire 2012-01-28 11:04:27 +00:00 committed by ThunderK
parent f3a0a72da2
commit ad491d300b
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gui_qt/mainwindow.cpp
View file

@ -76,10 +76,12 @@ MainWindow::MainWindow(QWidget *parent) :
//QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll())); //QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()));
menu = menuBar()->addMenu("Scene"); menu = menuBar()->addMenu("Scene");
menu->addAction("New", this, SLOT(fileNew())); menu->addAction("New", this, SLOT(fileNew()), QKeySequence(Qt::CTRL + Qt::Key_N));
menu->addAction("Save", this, SLOT(fileSave())); menu->addSeparator();
menu->addAction("Load", this, SLOT(fileLoad())); menu->addAction("Save", this, SLOT(fileSave()), QKeySequence(Qt::CTRL + Qt::Key_S));
menu->addAction("Quit", this, SLOT(close())); menu->addAction("Open", this, SLOT(fileLoad()), QKeySequence(Qt::CTRL + Qt::Key_O));
menu->addSeparator();
menu->addAction("Quit", this, SLOT(close()), QKeySequence(Qt::CTRL + Qt::Key_Q));
menu = menuBar()->addMenu("Actions"); menu = menuBar()->addMenu("Actions");
menu->addAction("Explore in 3D", this, SLOT(explore3D()), QKeySequence("F2")); menu->addAction("Explore in 3D", this, SLOT(explore3D()), QKeySequence("F2"));

29
lib_paysages/terrain.c
View file

@ -137,13 +137,13 @@ void terrainDelModifier(TerrainDefinition* definition, int modifier_position)
} }
} }
static inline double _getHeight(TerrainDefinition* definition, double x, double z, double detail) static inline double _getHeight(TerrainDefinition* definition, double x, double z)
{ {
Vector3 location; Vector3 location;
int i; int i;
location.x = x; location.x = x;
location.y = noiseGet2DDetail(definition->height_noise, x / definition->scaling, z / definition->scaling, detail) * definition->height_factor; location.y = noiseGet2DTotal(definition->height_noise, x / definition->scaling, z / definition->scaling) * definition->height_factor;
location.z = z; location.z = z;
for (i = 0; i < definition->height_modifiers_count; i++) for (i = 0; i < definition->height_modifiers_count; i++)
@ -154,12 +154,12 @@ static inline double _getHeight(TerrainDefinition* definition, double x, double
return location.y; return location.y;
} }
static inline Vector3 _getPoint(TerrainDefinition* definition, double x, double z, double detail) static inline Vector3 _getPoint(TerrainDefinition* definition, double x, double z)
{ {
Vector3 result; Vector3 result;
result.x = x; result.x = x;
result.y = _getHeight(definition, x, z, detail); result.y = _getHeight(definition, x, z);
result.z = z; result.z = z;
return result; return result;
@ -175,7 +175,7 @@ Color terrainLightFilter(TerrainDefinition* definition, Renderer* renderer, Colo
{ {
return light; return light;
} }
inc_factor = (double)renderer->render_quality; inc_factor = (double)renderer->render_quality;
inc_base = 1.0; inc_base = 1.0;
inc_value = inc_base / inc_factor; inc_value = inc_base / inc_factor;
@ -188,7 +188,7 @@ Color terrainLightFilter(TerrainDefinition* definition, Renderer* renderer, Colo
inc_vector = v3Scale(direction_to_light, inc_value); inc_vector = v3Scale(direction_to_light, inc_value);
length += v3Norm(inc_vector); length += v3Norm(inc_vector);
location = v3Add(location, inc_vector); location = v3Add(location, inc_vector);
height = _getHeight(definition, location.x, location.z, inc_value); height = _getHeight(definition, location.x, location.z);
diff = location.y - height; diff = location.y - height;
if (diff < 0.0) if (diff < 0.0)
{ {
@ -249,13 +249,13 @@ int terrainProjectRay(TerrainDefinition* definition, Renderer* renderer, Vector3
inc_vector = v3Scale(direction, inc_value); inc_vector = v3Scale(direction, inc_value);
length += v3Norm(inc_vector); length += v3Norm(inc_vector);
start = v3Add(start, inc_vector); start = v3Add(start, inc_vector);
height = _getHeight(definition, start.x, start.z, inc_value); height = _getHeight(definition, start.x, start.z);
diff = start.y - height; diff = start.y - height;
if (diff < 0.0) if (diff < 0.0)
{ {
start.y = height; start.y = height;
*hit_point = start; *hit_point = start;
*hit_color = _getColor(definition, renderer, start, inc_value); *hit_color = _getColor(definition, renderer, start, renderer->getPrecision(renderer, start));
return 1; return 1;
} }
@ -285,10 +285,9 @@ static int _postProcessFragment(RenderFragment* fragment, Renderer* renderer, vo
definition = (TerrainDefinition*)data; definition = (TerrainDefinition*)data;
point = fragment->vertex.location; point = fragment->vertex.location;
point = _getPoint(definition, point.x, point.z);
precision = renderer->getPrecision(renderer, point); precision = renderer->getPrecision(renderer, point);
point = _getPoint(definition, point.x, point.z, precision);
fragment->vertex.color = _getColor(definition, renderer, point, precision); fragment->vertex.color = _getColor(definition, renderer, point, precision);
return 1; return 1;
@ -299,7 +298,7 @@ static Vertex _getFirstPassVertex(TerrainDefinition* definition, double x, doubl
Vertex result; Vertex result;
double value; double value;
result.location = _getPoint(definition, x, z, 0.0); result.location = _getPoint(definition, x, z);
value = sin(x) * sin(x) * cos(z) * cos(z); value = sin(x) * sin(x) * cos(z) * cos(z);
result.color.r = value; result.color.r = value;
result.color.g = value; result.color.g = value;
@ -325,7 +324,7 @@ static void _renderQuad(TerrainDefinition* definition, Renderer* renderer, doubl
double terrainGetHeight(TerrainDefinition* definition, double x, double z) double terrainGetHeight(TerrainDefinition* definition, double x, double z)
{ {
return _getHeight(definition, x, z, 0.0); return _getHeight(definition, x, z);
} }
double terrainGetHeightNormalized(TerrainDefinition* definition, double x, double z) double terrainGetHeightNormalized(TerrainDefinition* definition, double x, double z)
@ -336,13 +335,13 @@ double terrainGetHeightNormalized(TerrainDefinition* definition, double x, doubl
} }
else else
{ {
return 0.5 + _getHeight(definition, x, z, 0.0) / (definition->_max_height * 2.0); return 0.5 + _getHeight(definition, x, z) / (definition->_max_height * 2.0);
} }
} }
Color terrainGetColor(TerrainDefinition* definition, Renderer* renderer, double x, double z, double detail) Color terrainGetColor(TerrainDefinition* definition, Renderer* renderer, double x, double z, double detail)
{ {
Vector3 point = _getPoint(definition, x, z, detail); Vector3 point = _getPoint(definition, x, z);
return _getColor(definition, renderer, point, detail); return _getColor(definition, renderer, point, detail);
} }

1
lib_paysages/textures.c
View file

@ -238,6 +238,7 @@ Color texturesGetColor(TexturesDefinition* definition, Renderer* renderer, Vecto
for (i = 0; i < definition->nbtextures; i++) for (i = 0; i < definition->nbtextures; i++)
{ {
/* TODO Do not compute layers fully covered */ /* TODO Do not compute layers fully covered */
/* TODO Optimize : each layer computes the same shadows */
tex_color = texturesGetLayerColor(definition->textures + i, renderer, location, detail); tex_color = texturesGetLayerColor(definition->textures + i, renderer, location, detail);
if (tex_color.a > 0.0001) if (tex_color.a > 0.0001)
{ {