graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Small include fixes and unused variable tagging

Browse source
This commit is contained in:
Michaël Lemaire 2013-09-27 22:04:05 +02:00
parent f1e2c17f2e
commit 8d701e910b
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/rendering/atmosphere/atm_bruneton.c
View file

@ -9,12 +9,12 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "../system.h" #include "rendering/system.h"
#include "../tools.h" #include "rendering/tools.h"
#include "../tools/cache.h" #include "rendering/tools/cache.h"
#include "../tools/texture.h" #include "rendering/tools/texture.h"
#include "../tools/parallel.h" #include "rendering/tools/parallel.h"
#include "../renderer.h" #include "rendering/renderer.h"
/*********************** Constants ***********************/ /*********************** Constants ***********************/
@ -1155,6 +1155,8 @@ void brunetonInit()
AtmosphereResult brunetonGetSkyColor(Renderer* renderer, Vector3 eye, Vector3 direction, Vector3 sun_position, Color base) AtmosphereResult brunetonGetSkyColor(Renderer* renderer, Vector3 eye, Vector3 direction, Vector3 sun_position, Color base)
{ {
UNUSED(base);
double yoffset = GROUND_OFFSET - renderer->water->getHeightInfo(renderer).base_height; double yoffset = GROUND_OFFSET - renderer->water->getHeightInfo(renderer).base_height;
eye.y += yoffset; eye.y += yoffset;
if (eye.y < 0.0) if (eye.y < 0.0)
@ -1237,6 +1239,9 @@ AtmosphereResult brunetonApplyAerialPerspective(Renderer* renderer, Vector3 loca
void brunetonGetLightingStatus(Renderer* renderer, LightStatus* status, Vector3 normal, int opaque) void brunetonGetLightingStatus(Renderer* renderer, LightStatus* status, Vector3 normal, int opaque)
{ {
UNUSED(normal);
UNUSED(opaque);
LightDefinition sun, irradiance; LightDefinition sun, irradiance;
double muS; double muS;

7
src/rendering/renderer.c
View file

@ -91,6 +91,13 @@ static void _pushDisplacedQuad(Renderer* renderer, Vector3 v1, Vector3 v2, Vecto
static RayCastingResult _rayWalking(Renderer* renderer, Vector3 location, Vector3 direction, int terrain, int water, int sky, int clouds) static RayCastingResult _rayWalking(Renderer* renderer, Vector3 location, Vector3 direction, int terrain, int water, int sky, int clouds)
{ {
UNUSED(renderer);
UNUSED(location);
UNUSED(direction);
UNUSED(terrain);
UNUSED(water);
UNUSED(sky);
UNUSED(clouds);
return _RAYCASTING_NULL; return _RAYCASTING_NULL;
} }

16
src/rendering/scenery.c
View file

@ -1,11 +1,12 @@
#include "scenery.h" #include "scenery.h"
#include <time.h> #include <time.h>
#include "tools/color.h" #include "rendering/terrain/ter_raster.h"
#include "tools/euclid.h" #include "rendering/tools.h"
#include "terrain/ter_raster.h" #include "rendering/tools/color.h"
#include "render.h" #include "rendering/tools/euclid.h"
#include "system.h" #include "rendering/render.h"
#include "rendering/system.h"
static AtmosphereDefinition* _atmosphere; static AtmosphereDefinition* _atmosphere;
static CameraDefinition* _camera; static CameraDefinition* _camera;
@ -187,6 +188,11 @@ static RayCastingResult _rayWalking(Renderer* renderer, Vector3 location, Vector
RayCastingResult result; RayCastingResult result;
Color sky_color; Color sky_color;
UNUSED(terrain);
UNUSED(water);
UNUSED(sky);
UNUSED(clouds);
result = renderer->terrain->castRay(renderer, location, direction); result = renderer->terrain->castRay(renderer, location, direction);
if (!result.hit) if (!result.hit)
{ {