eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:libremapping/libremapping

Browse Source 
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
This commit is contained in:
Tats
2013-11-29 12:09:49 -05:00
parent 97379366e3 0e73f157f8
commit fd958cecf2
40 changed files with 1605 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MapperGLCanvas.cpp
+4 -4
View File
@@ -33,7 +33,7 @@ void MapperGLCanvas::initializeGL()
//glEnable(GL_CULL_FACE);
}
void MapperGLCanvas::resizeGL(int width, int height)
void MapperGLCanvas::resizeGL(int /* width */, int /* height */)
{
// glClearColor(0.0, 0.0, 0.0, 0.0);
//
@@ -63,8 +63,8 @@ void MapperGLCanvas::draw()
exitDraw();
}
void MapperGLCanvas::enterDraw() {
void MapperGLCanvas::enterDraw()
{
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
glViewport(0, 0, width(), height());
@@ -135,7 +135,7 @@ void MapperGLCanvas::keyPressEvent(QKeyEvent* event)
emit quadChanged();
}
void MapperGLCanvas::paintEvent(QPaintEvent* event)
void MapperGLCanvas::paintEvent(QPaintEvent* /* event */)
{
std::cout << "Paint event" << std::endl;
updateGL();