summaryrefslogtreecommitdiffstats
path: root/src/mmscene.cpp
diff options
context:
space:
mode:
authorStefan Suhren <suhren.stefan@fh-swf.de>2016-01-05 12:38:59 +0100
committerStefan Suhren <suhren.stefan@fh-swf.de>2016-01-05 12:38:59 +0100
commitf49ba9d043ebf12636df70f9ed3addaf5d61755c (patch)
treefcd8e2c78e9f19ab441eb5621c8017080184b972 /src/mmscene.cpp
parent88d5a271d2e75aef2249d450d325b84fd0e21207 (diff)
parent9e83d173a5995587c208051fdd62420f51ff5378 (diff)
downloadMultimedia-f49ba9d043ebf12636df70f9ed3addaf5d61755c.tar.gz
Multimedia-f49ba9d043ebf12636df70f9ed3addaf5d61755c.zip
Merge branch 'refs/heads/hitDetection'
Diffstat (limited to 'src/mmscene.cpp')
-rw-r--r--src/mmscene.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mmscene.cpp b/src/mmscene.cpp
index ccae5a5..1554e83 100644
--- a/src/mmscene.cpp
+++ b/src/mmscene.cpp
@@ -76,7 +76,9 @@ void MMScene::setupGeometry()
void MMScene::mousePressed(int x, int y)
{
renderer()->calculateMousePoints(&m_MouseNear, &m_mouseFar, QPoint(x, y));
- renderer()->mouseIntersection(&m_lastIntersection, v_Y, 0.0, QPoint(x, y)); //get starting point
+ renderer()->mouseIntersection(&m_lastIntersection, v_Z, 0.0, QPoint(x, y)); //get starting point
+ if (m_disc->isHit(m_MouseNear, m_mouseFar))
+ qDebug() << "Treffer";
}
void MMScene::drawTriangles()