Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move renderLaserPointers() into a draw item

Browse source
This commit is contained in:
ZappoMan 2015-07-23 10:42:22 -07:00
parent ea7238f17b
commit f4ec09a48b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -3295,10 +3295,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems); sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems);
sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems); sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);
} }
//Render the sixense lasers
if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {
_myAvatar->renderLaserPointers(*renderArgs->_batch);
}
if (!selfAvatarOnly) { if (!selfAvatarOnly) {
// give external parties a change to hook in // give external parties a change to hook in

5
interface/src/avatar/MyAvatar.cpp
View file

@ -345,6 +345,11 @@ void MyAvatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
renderArgs && renderArgs->_batch) { renderArgs && renderArgs->_batch) {
_skeletonModel.renderIKConstraints(*renderArgs->_batch); _skeletonModel.renderIKConstraints(*renderArgs->_batch);
} }
//Render the sixense lasers
if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {
renderLaserPointers(*renderArgs->_batch);
}
} }
const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f); const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);