History

Merge pull request #1297 from PhilipRosedale/master

Voxel editing with hands, flying by pointing hands

ZappoMan committed 12 years ago

Commit 44f92fb2 parents 858268b 7ab9cc99 files · +202 −50Browse files

Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Application.cpp+61−24
@@ -1480,6 +1480,54 @@ void Application::doKillLocalVoxels() { · 1479 unmodified lines
14801480 _wantToKillLocalVoxels = true;
14811481 }
14821482
1483+void Application::removeVoxel(glm::vec3 position,
1484+ float scale) {
1485+ VoxelDetail voxel;
1486+ voxel.x = position.x / TREE_SCALE;
1487+ voxel.y = position.y / TREE_SCALE;
1488+ voxel.z = position.z / TREE_SCALE;
1489+ voxel.s = scale / TREE_SCALE;
1490+ _voxelEditSender.sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, voxel);
1491+
1492+ // delete it locally to see the effect immediately (and in case no voxel server is present)
1493+ _voxels.deleteVoxelAt(voxel.x, voxel.y, voxel.z, voxel.s);
1494+}
1495+
1496+void Application::makeVoxel(glm::vec3 position,
1497+ float scale,
1498+ unsigned char red,
1499+ unsigned char green,
1500+ unsigned char blue,
1501+ bool isDestructive) {
1502+ VoxelDetail voxel;
1503+ voxel.x = position.x / TREE_SCALE;
1504+ voxel.y = position.y / TREE_SCALE;
1505+ voxel.z = position.z / TREE_SCALE;
1506+ voxel.s = scale / TREE_SCALE;
1507+ voxel.red = red;
1508+ voxel.green = green;
1509+ voxel.blue = blue;
1510+ PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL;
1511+ _voxelEditSender.sendVoxelEditMessage(message, voxel);
1512+
1513+ // create the voxel locally so it appears immediately
1514+
1515+ _voxels.createVoxel(voxel.x, voxel.y, voxel.z, voxel.s,
1516+ voxel.red, voxel.green, voxel.blue,
1517+ isDestructive);
1518+
1519+ // Implement voxel fade effect
1520+ VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f);
1521+ const float VOXEL_BOUNDS_ADJUST = 0.01f;
1522+ float slightlyBigger = voxel.s * VOXEL_BOUNDS_ADJUST;
1523+ fade.voxelDetails.x = voxel.x - slightlyBigger;
1524+ fade.voxelDetails.y = voxel.y - slightlyBigger;
1525+ fade.voxelDetails.z = voxel.z - slightlyBigger;
1526+ fade.voxelDetails.s = voxel.s + slightlyBigger + slightlyBigger;
1527+ _voxelFades.push_back(fade);
1528+
1529+}
1530+
14831531 const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) {
14841532 return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE,
14851533 (_mouseVoxel.y + _mouseVoxel.s / 2.f) * TREE_SCALE,
@@ -2214,11 +2262,11 @@ void Application::updateLeap(float deltaTime) { · 728 unmodified lines
22142262 LeapManager::nextFrame();
22152263 }
22162264
2217−void Application::updateSixense() {
2265+void Application::updateSixense(float deltaTime) {
22182266 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
22192267 PerformanceWarning warn(showWarnings, "Application::updateSixense()");
22202268
2221− _sixenseManager.update();
2269+ _sixenseManager.update(deltaTime);
22222270 }
22232271
22242272 void Application::updateSerialDevices(float deltaTime) {
@@ -2428,7 +2476,7 @@ void Application::update(float deltaTime) { · 203 unmodified lines
24282476 updateMouseVoxels(deltaTime, mouseRayOrigin, mouseRayDirection, distance, face); // UI/UX related to voxels
24292477 updateHandAndTouch(deltaTime); // Update state for touch sensors
24302478 updateLeap(deltaTime); // Leap finger-sensing device
2431− updateSixense(); // Razer Hydra controllers
2479+ updateSixense(deltaTime); // Razer Hydra controllers
24322480 updateSerialDevices(deltaTime); // Read serial port interface devices
24332481 updateAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes
24342482 updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
@@ -3945,29 +3993,18 @@ bool Application::maybeEditVoxelUnderCursor() { · 1510 unmodified lines
39453993 if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode)
39463994 || Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode)) {
39473995 if (_mouseVoxel.s != 0) {
3948− PACKET_TYPE message = Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel)
3949− ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE
3950− : PACKET_TYPE_SET_VOXEL;
3951− _voxelEditSender.sendVoxelEditMessage(message, _mouseVoxel);
3952−
3953− // create the voxel locally so it appears immediately
3954− _voxels.createVoxel(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s,
3955− _mouseVoxel.red, _mouseVoxel.green, _mouseVoxel.blue,
3956− Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel));
3957−
3958− // Implement voxel fade effect
3959− VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f);
3960− const float VOXEL_BOUNDS_ADJUST = 0.01f;
3961− float slightlyBigger = _mouseVoxel.s * VOXEL_BOUNDS_ADJUST;
3962− fade.voxelDetails.x = _mouseVoxel.x - slightlyBigger;
3963− fade.voxelDetails.y = _mouseVoxel.y - slightlyBigger;
3964− fade.voxelDetails.z = _mouseVoxel.z - slightlyBigger;
3965− fade.voxelDetails.s = _mouseVoxel.s + slightlyBigger + slightlyBigger;
3966− _voxelFades.push_back(fade);
3967−
3996+ makeVoxel(glm::vec3(_mouseVoxel.x * TREE_SCALE,
3997+ _mouseVoxel.y * TREE_SCALE,
3998+ _mouseVoxel.z * TREE_SCALE),
3999+ _mouseVoxel.s * TREE_SCALE,
4000+ _mouseVoxel.red,
4001+ _mouseVoxel.green,
4002+ _mouseVoxel.blue,
4003+ Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel));
4004+
39684005 // inject a sound effect
39694006 injectVoxelAddedSoundEffect();
3970−
4007+
39714008 // remember the position for drag detection
39724009 _justEditedVoxel = true;
39734010

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t