Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes per code review

Browse source
This commit is contained in:
Philip Rosedale 2013-06-13 12:05:06 -07:00
parent d517487d1b
commit b85f91a7d4
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -1016,7 +1016,7 @@ static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail) {
} }
} }
const glm::vec3 Application::getMouseVoxelWorldCoordinates(VoxelDetail _mouseVoxel) { const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) {
return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE, return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE,
(_mouseVoxel.y + _mouseVoxel.s / 2.f) * TREE_SCALE, (_mouseVoxel.y + _mouseVoxel.s / 2.f) * TREE_SCALE,
(_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE); (_mouseVoxel.z + _mouseVoxel.s / 2.f) * TREE_SCALE);
@ -2206,7 +2206,7 @@ void Application::displayStats() {
} }
} }
void Application::renderThrustAtVoxel(glm::vec3 thrust) { void Application::renderThrustAtVoxel(const glm::vec3& thrust) {
if (_mousePressed) { if (_mousePressed) {
glColor3f(1, 0, 0); glColor3f(1, 0, 0);
glLineWidth(2.0f); glLineWidth(2.0f);

4
interface/src/Application.h
View file

@ -67,7 +67,7 @@ public:
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event);
const glm::vec3 getMouseVoxelWorldCoordinates(VoxelDetail _mouseVoxel); const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel);
Avatar* getAvatar() { return &_myAvatar; } Avatar* getAvatar() { return &_myAvatar; }
Camera* getCamera() { return &_myCamera; } Camera* getCamera() { return &_myCamera; }
@ -95,7 +95,7 @@ private slots:
void setRenderFirstPerson(bool firstPerson); void setRenderFirstPerson(bool firstPerson);
void renderThrustAtVoxel(glm::vec3 thrust); void renderThrustAtVoxel(const glm::vec3& thrust);
void renderLineToTouchedVoxel(); void renderLineToTouchedVoxel();
void setFrustumOffset(bool frustumOffset); void setFrustumOffset(bool frustumOffset);

1
interface/src/Avatar.cpp
View file

@ -617,7 +617,6 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
// set head lookat position // set head lookat position
if (!_owningAgent) { if (!_owningAgent) {
//if (_camera)
if (_interactingOther) { if (_interactingOther) {
_head.setLookAtPosition(_interactingOther->calculateAverageEyePosition()); _head.setLookAtPosition(_interactingOther->calculateAverageEyePosition());
} else { } else {