CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"Drag"

Browse Source
This commit is contained in:
andreja6
2018-10-27 09:00:39 -07:00
parent 948835df98
commit 61d07a8557
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main.cpp
View File

@@ -79,7 +79,8 @@ static const int RESIZE = 2;
static POINT oldGlobalMouse; static POINT oldGlobalMouse;
static int mode = CURSOR; static int mode = CURSOR;
bool dragging = false; bool dragging = false;
Vector2 oldMouse = Vector2(0,0); #include <math.h>
Vector2 mouseDownOn = Vector2(nan(), 0);
float moveRate = 0.5; float moveRate = 0.5;
static const std::string PlaceholderName = "HyperCube"; static const std::string PlaceholderName = "HyperCube";
@@ -967,6 +968,17 @@ void Demo::onUserInput(UserInput* ui) {
dataModel->mouseButton1Down = (GetKeyState(VK_LBUTTON) & 0x100) != 0; dataModel->mouseButton1Down = (GetKeyState(VK_LBUTTON) & 0x100) != 0;
if (GetHoldKeyState(VK_LBUTTON)) { if (GetHoldKeyState(VK_LBUTTON)) {
if(!G3D::isNaN(mouseDownOn.x))
{
if(abs(mouseDownOn.x - dataModel->mousex) > 4 || abs(mouseDownOn.y - dataModel->mousey) > 4)
{
dragging = true;
}
}
else
{
mouseDownOn = Vector2(dataModel->mousex, dataModel->mousey);
}
if (dragging) { if (dragging) {
PartInstance* part = NULL; PartInstance* part = NULL;
if(g_selectedInstances.size() > 0) if(g_selectedInstances.size() > 0)
@@ -983,7 +995,7 @@ void Demo::onUserInput(UserInput* ui) {
{ {
if (__nearest>__time) if (__nearest>__time)
{ {
Vector3 closest = (dragRay.closestPoint(moveTo->getPosition()) * 2); Vector3 closest = (dragRay.closestPoint(moveTo->getPosition()));
part->setPosition(closest); part->setPosition(closest);
//part->setPosition(Vector3(floor(closest.x),part->getPosition().y,floor(closest.z))); //part->setPosition(Vector3(floor(closest.x),part->getPosition().y,floor(closest.z)));
} }
@@ -993,6 +1005,11 @@ void Demo::onUserInput(UserInput* ui) {
Sleep(10); Sleep(10);
} }
} }
else
{
dragging = false;
mouseDownOn = Vector2(nan(), 0);
}
// Camera KB Handling { // Camera KB Handling {
if (GetKPBool(VK_OEM_COMMA)) //Left if (GetKPBool(VK_OEM_COMMA)) //Left
usableApp->cameraController.panLeft(); usableApp->cameraController.panLeft();
@@ -1483,7 +1500,7 @@ void Demo::onMouseRightUp(int x,int y)
} }
void Demo::onMouseMoved(int x,int y) void Demo::onMouseMoved(int x,int y)
{ {
oldMouse = dataModel->getMousePos(); //oldMouse = dataModel->getMousePos();
dataModel->mousex = x; dataModel->mousex = x;
dataModel->mousey = y; dataModel->mousey = y;