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

changed function name so less confusing

Browse source
This commit is contained in:
Philip Rosedale 2013-12-01 20:46:42 -08:00
parent ea850368de
commit 2456c26207
3 changed files with 31 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
interface/src/Application.cpp
View file

@ -1487,18 +1487,20 @@ void Application::doKillLocalVoxels() {
_wantToKillLocalVoxels = true; _wantToKillLocalVoxels = true;
} }
void Application::createVoxel(glm::vec3 position, void Application::makeVoxel(glm::vec3 position,
float scale, float scale,
glm::vec3 color, unsigned char red,
bool isDestructive) { unsigned char green,
unsigned char blue,
bool isDestructive) {
VoxelDetail voxel; VoxelDetail voxel;
voxel.x = position.x / TREE_SCALE; voxel.x = position.x / TREE_SCALE;
voxel.y = position.y / TREE_SCALE; voxel.y = position.y / TREE_SCALE;
voxel.z = position.z / TREE_SCALE; voxel.z = position.z / TREE_SCALE;
voxel.s = scale / TREE_SCALE; voxel.s = scale / TREE_SCALE;
voxel.red = color.x; voxel.red = red;
voxel.green = color.y; voxel.green = green;
voxel.blue = color.z; voxel.blue = blue;
PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL; PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL;
_voxelEditSender.sendVoxelEditMessage(message, voxel); _voxelEditSender.sendVoxelEditMessage(message, voxel);
@ -1518,11 +1520,6 @@ void Application::createVoxel(glm::vec3 position,
fade.voxelDetails.s = voxel.s + slightlyBigger + slightlyBigger; fade.voxelDetails.s = voxel.s + slightlyBigger + slightlyBigger;
_voxelFades.push_back(fade); _voxelFades.push_back(fade);
// inject a sound effect
injectVoxelAddedSoundEffect();
// remember the position for drag detection
_justEditedVoxel = true;
} }
const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) { const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) {
@ -4129,31 +4126,18 @@ bool Application::maybeEditVoxelUnderCursor() {
if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode)
|| Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode)) { || Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode)) {
if (_mouseVoxel.s != 0) { if (_mouseVoxel.s != 0) {
PACKET_TYPE message = Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel) makeVoxel(glm::vec3(_mouseVoxel.x * TREE_SCALE,
? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE _mouseVoxel.y * TREE_SCALE,
: PACKET_TYPE_SET_VOXEL; _mouseVoxel.z * TREE_SCALE),
_voxelEditSender.sendVoxelEditMessage(message, _mouseVoxel); _mouseVoxel.s * TREE_SCALE,
_mouseVoxel.red,
// create the voxel locally so it appears immediately _mouseVoxel.green,
printf("create voxel from mouse %.4f, %.4f, %.4f, scale %.6f \n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); _mouseVoxel.blue,
Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel));
_voxels.createVoxel(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s,
_mouseVoxel.red, _mouseVoxel.green, _mouseVoxel.blue,
Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel));
// Implement voxel fade effect
VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f);
const float VOXEL_BOUNDS_ADJUST = 0.01f;
float slightlyBigger = _mouseVoxel.s * VOXEL_BOUNDS_ADJUST;
fade.voxelDetails.x = _mouseVoxel.x - slightlyBigger;
fade.voxelDetails.y = _mouseVoxel.y - slightlyBigger;
fade.voxelDetails.z = _mouseVoxel.z - slightlyBigger;
fade.voxelDetails.s = _mouseVoxel.s + slightlyBigger + slightlyBigger;
_voxelFades.push_back(fade);
// inject a sound effect // inject a sound effect
injectVoxelAddedSoundEffect(); injectVoxelAddedSoundEffect();
// remember the position for drag detection // remember the position for drag detection
_justEditedVoxel = true; _justEditedVoxel = true;

7
interface/src/Application.h
View file

@ -117,7 +117,12 @@ public:
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event);
void createVoxel(glm::vec3 position, float scale, glm::vec3 color, bool isDestructive); void makeVoxel(glm::vec3 position,
float scale,
unsigned char red,
unsigned char green,
unsigned char blue,
bool isDestructive);
const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel);
QGLWidget* getGLWidget() { return _glWidget; } QGLWidget* getGLWidget() { return _glWidget; }

8
interface/src/avatar/Hand.cpp
View file

@ -72,8 +72,12 @@ void Hand::simulate(float deltaTime, bool isMine) {
glm::vec3 newVoxelPosition = finger.getTipPosition(); glm::vec3 newVoxelPosition = finger.getTipPosition();
if (glm::length(newVoxelPosition - _lastFingerVoxel) > (FINGERTIP_VOXEL_SIZE / 2.f)) { if (glm::length(newVoxelPosition - _lastFingerVoxel) > (FINGERTIP_VOXEL_SIZE / 2.f)) {
QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>(); QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value<QColor>();
glm::vec3 newVoxelColor(paintColor.red(), paintColor.green(), paintColor.blue()); Application::getInstance()->makeVoxel(newVoxelPosition,
Application::getInstance()->createVoxel(newVoxelPosition, FINGERTIP_VOXEL_SIZE, newVoxelColor, true); FINGERTIP_VOXEL_SIZE,
paintColor.red(),
paintColor.green(),
paintColor.blue(),
true);
_lastFingerVoxel = newVoxelPosition; _lastFingerVoxel = newVoxelPosition;
} }
} }