Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some ray pick helper code that was only used by hover voxel, main ray pick still exists

Browse source
This commit is contained in:
ZappoMan 2014-03-02 19:37:40 -08:00
parent cb4219b775
commit 855e351f39
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/voxels/src/VoxelTree.cpp
View file

@ -561,29 +561,3 @@ int VoxelTree::processEditPacketData(PacketType packetType, const unsigned char*
return 0; return 0;
} }
} }
bool VoxelTree::findRayIntersectionDetail(const glm::vec3& origin, const glm::vec3& direction,
VoxelDetail& detail, float& distance, BoxFace& face) {
bool result = false; // assume no intersection
if (tryLockForRead()) {
OctreeElement* element;
result = findRayIntersection(origin, direction, element, distance, face);
if (result) {
VoxelTreeElement* voxel = (VoxelTreeElement*)element;
detail.x = voxel->getCorner().x;
detail.y = voxel->getCorner().y;
detail.z = voxel->getCorner().z;
detail.s = voxel->getScale();
detail.red = voxel->getColor()[0];
detail.green = voxel->getColor()[1];
detail.blue = voxel->getColor()[2];
}
unlock();
}
return result;
}

3
libraries/voxels/src/VoxelTree.h
View file

@ -45,9 +45,6 @@ public:
virtual int processEditPacketData(PacketType packetType, const unsigned char* packetData, int packetLength, virtual int processEditPacketData(PacketType packetType, const unsigned char* packetData, int packetLength,
const unsigned char* editData, int maxLength, const SharedNodePointer& node); const unsigned char* editData, int maxLength, const SharedNodePointer& node);
bool findRayIntersectionDetail(const glm::vec3& origin, const glm::vec3& direction,
VoxelDetail& detail, float& distance, BoxFace& face);
private: private:
// helper functions for nudgeSubTree // helper functions for nudgeSubTree
void recurseNodeForNudge(VoxelTreeElement* element, RecurseOctreeOperation operation, void* extraData); void recurseNodeForNudge(VoxelTreeElement* element, RecurseOctreeOperation operation, void* extraData);