graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fixed compiler warnings

Browse source
This commit is contained in:
Michaël Lemaire 2015-08-13 23:59:27 +02:00
parent 0fc10fd28b
commit d65bc18342
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/interface/modeler/quickapp/RenderPreviewProvider.cpp
View file

@ -22,7 +22,7 @@ RenderPreviewProvider::~RenderPreviewProvider()
delete pixbuf; delete pixbuf;
} }
QImage RenderPreviewProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) QImage RenderPreviewProvider::requestImage(const QString &, QSize *size, const QSize &)
{ {
if (canvas) if (canvas)
{ {

2
src/interface/modeler/quickapp/WaterModeler.cpp
View file

@ -12,7 +12,7 @@ WaterModeler::WaterModeler(MainModelerWindow *main):
} }
} }
void WaterModeler::waterLevelChanged(double value) void WaterModeler::waterLevelChanged(double)
{ {
// TODO // TODO
//qDebug() << "water level : " << value; //qDebug() << "water level : " << value;

2
src/render/software/FluidMediumManager.cpp
View file

@ -29,7 +29,7 @@ Color FluidMediumManager::applyTraversal(const Vector3 &eye, const Vector3 &loca
int max_segments = media.size(); int max_segments = media.size();
FluidMediumSegment* segments; FluidMediumSegment* segments;
segments = new FluidMediumSegment[max_segments]; segments = new FluidMediumSegment[max_segments];
int segment_count = getTraversedMedia(segments, ray, max_segments); getTraversedMedia(segments, ray, max_segments);
delete[] segments; delete[] segments;
return color; return color;

2
src/render/software/TerrainRasterizer.cpp
View file

@ -192,7 +192,7 @@ void TerrainRasterizer::getTessellationInfo(CanvasPortion* canvas, bool displace
} }
} }
void TerrainRasterizer::processChunk(CanvasPortion* canvas, TerrainChunkInfo* chunk, double progress) void TerrainRasterizer::processChunk(CanvasPortion* canvas, TerrainChunkInfo* chunk, double)
{ {
tessellateChunk(canvas, chunk, chunk->detail_hint); tessellateChunk(canvas, chunk, chunk->detail_hint);
} }

13
src/tests/DefinitionNode_Test.cpp
View file

@ -42,12 +42,12 @@ TEST(DefinitionNode, saveLoad)
DefinitionNode* before = new DefinitionNode(NULL, "root"); DefinitionNode* before = new DefinitionNode(NULL, "root");
DefinitionNode* before1 = new DefinitionNode(before, "before1"); DefinitionNode* before1 = new DefinitionNode(before, "before1");
FloatNode* before11 = new FloatNode(before1, "before11", 2.1); new FloatNode(before1, "before11", 2.1);
FloatNode* before12 = new FloatNode(before1, "before12", -4.3); new FloatNode(before1, "before12", -4.3);
DefinitionNode* before2 = new DefinitionNode(before, "before2"); DefinitionNode* before2 = new DefinitionNode(before, "before2");
DefinitionNode* before21 = new DefinitionNode(before2, "before21"); new DefinitionNode(before2, "before21");
FloatNode* before22 = new FloatNode(before2, "before22"); new FloatNode(before2, "before22");
FloatNode* before3 = new FloatNode(before, "before3", 6.7); new FloatNode(before, "before3", 6.7);
stream = new PackStream(); stream = new PackStream();
stream->bindToFile("/tmp/test_paysages_pack", true); stream->bindToFile("/tmp/test_paysages_pack", true);
@ -71,4 +71,7 @@ TEST(DefinitionNode, saveLoad)
EXPECT_DOUBLE_EQ(0.0, after13->getValue()); EXPECT_DOUBLE_EQ(0.0, after13->getValue());
EXPECT_DOUBLE_EQ(6.7, after3->getValue()); EXPECT_DOUBLE_EQ(6.7, after3->getValue());
EXPECT_DOUBLE_EQ(0.0, after4->getValue()); EXPECT_DOUBLE_EQ(0.0, after4->getValue());
delete before;
delete after;
} }