Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
examples/ThirdPartyLibs/Gwen/DragAndDrop.cpp
View File

@@ -4,7 +4,6 @@
See license in Gwen.h
*/
#include "Gwen/Gwen.h"
#include "Gwen/DragAndDrop.h"
#include "Gwen/Utility.h"
@@ -21,9 +20,9 @@ static Gwen::Controls::Base* LastPressedControl = NULL;
static Gwen::Controls::Base* NewHoveredControl = NULL;
static Gwen::Point LastPressedPos;
void DragAndDrop::ControlDeleted( Gwen::Controls::Base* pControl )
void DragAndDrop::ControlDeleted(Gwen::Controls::Base* pControl)
{
if ( SourceControl == pControl )
if (SourceControl == pControl)
{
SourceControl = NULL;
CurrentPackage = NULL;
@@ -31,22 +30,22 @@ void DragAndDrop::ControlDeleted( Gwen::Controls::Base* pControl )
LastPressedControl = NULL;
}
if ( LastPressedControl == pControl )
if (LastPressedControl == pControl)
LastPressedControl = NULL;
if ( HoveredControl == pControl )
if (HoveredControl == pControl)
HoveredControl = NULL;
if ( NewHoveredControl == pControl )
if (NewHoveredControl == pControl)
NewHoveredControl = NULL;
}
static int m_iMouseX = 0;
static int m_iMouseY = 0;
bool DragAndDrop::Start( Gwen::Controls::Base* pControl, Package* pPackage )
bool DragAndDrop::Start(Gwen::Controls::Base* pControl, Package* pPackage)
{
if ( CurrentPackage )
if (CurrentPackage)
{
return false;
}
@@ -56,18 +55,18 @@ bool DragAndDrop::Start( Gwen::Controls::Base* pControl, Package* pPackage )
return true;
}
bool OnDrop( int x, int y )
bool OnDrop(int x, int y)
{
bool bSuccess = false;
if ( DragAndDrop::HoveredControl )
if (DragAndDrop::HoveredControl)
{
DragAndDrop::HoveredControl->DragAndDrop_HoverLeave( DragAndDrop::CurrentPackage );
bSuccess = DragAndDrop::HoveredControl->DragAndDrop_HandleDrop( DragAndDrop::CurrentPackage, x, y );
DragAndDrop::HoveredControl->DragAndDrop_HoverLeave(DragAndDrop::CurrentPackage);
bSuccess = DragAndDrop::HoveredControl->DragAndDrop_HandleDrop(DragAndDrop::CurrentPackage, x, y);
}
// Report back to the source control, to tell it if we've been successful.
DragAndDrop::SourceControl->DragAndDrop_EndDragging( bSuccess, x, y );
DragAndDrop::SourceControl->DragAndDrop_EndDragging(bSuccess, x, y);
DragAndDrop::CurrentPackage = NULL;
DragAndDrop::SourceControl = NULL;
@@ -75,56 +74,54 @@ bool OnDrop( int x, int y )
return true;
}
bool DragAndDrop::OnMouseButton( Gwen::Controls::Base* pHoveredControl, int x, int y, bool bDown )
bool DragAndDrop::OnMouseButton(Gwen::Controls::Base* pHoveredControl, int x, int y, bool bDown)
{
if ( !bDown )
if (!bDown)
{
LastPressedControl = NULL;
// Not carrying anything, allow normal actions
if ( !CurrentPackage )
if (!CurrentPackage)
return false;
// We were carrying something, drop it.
OnDrop( x, y );
OnDrop(x, y);
return true;
}
if ( !pHoveredControl ) return false;
if ( !pHoveredControl->DragAndDrop_Draggable() ) return false;
if (!pHoveredControl) return false;
if (!pHoveredControl->DragAndDrop_Draggable()) return false;
// Store the last clicked on control. Don't do anything yet,
// Store the last clicked on control. Don't do anything yet,
// we'll check it in OnMouseMoved, and if it moves further than
// x pixels with the mouse down, we'll start to drag.
LastPressedPos = Gwen::Point( x, y );
LastPressedPos = Gwen::Point(x, y);
LastPressedControl = pHoveredControl;
return false;
}
bool ShouldStartDraggingControl( int x, int y )
bool ShouldStartDraggingControl(int x, int y)
{
// We're not holding a control down..
if ( !LastPressedControl ) return false;
if (!LastPressedControl) return false;
// Not been dragged far enough
int iLength = abs( x - LastPressedPos.x ) + abs( y - LastPressedPos.y );
if ( iLength < 5 ) return false;
int iLength = abs(x - LastPressedPos.x) + abs(y - LastPressedPos.y);
if (iLength < 5) return false;
// Create the dragging package
DragAndDrop::CurrentPackage = LastPressedControl->DragAndDrop_GetPackage( LastPressedPos.x, LastPressedPos.y );
DragAndDrop::CurrentPackage = LastPressedControl->DragAndDrop_GetPackage(LastPressedPos.x, LastPressedPos.y);
// We didn't create a package!
if ( !DragAndDrop::CurrentPackage )
if (!DragAndDrop::CurrentPackage)
{
LastPressedControl = NULL;
DragAndDrop::SourceControl = NULL;
return false;
}
// Now we're dragging something!
DragAndDrop::SourceControl = LastPressedControl;
Gwen::MouseFocus = NULL;
@@ -133,20 +130,19 @@ bool ShouldStartDraggingControl( int x, int y )
// Some controls will want to decide whether they should be dragged at that moment.
// This function is for them (it defaults to true)
if ( !DragAndDrop::SourceControl->DragAndDrop_ShouldStartDrag() )
if (!DragAndDrop::SourceControl->DragAndDrop_ShouldStartDrag())
{
DragAndDrop::SourceControl = NULL;
DragAndDrop::CurrentPackage = NULL;
return false;
}
DragAndDrop::SourceControl->DragAndDrop_StartDragging( DragAndDrop::CurrentPackage, LastPressedPos.x, LastPressedPos.y );
DragAndDrop::SourceControl->DragAndDrop_StartDragging(DragAndDrop::CurrentPackage, LastPressedPos.x, LastPressedPos.y);
return true;
}
void UpdateHoveredControl( Gwen::Controls::Base* pCtrl, int x, int y )
void UpdateHoveredControl(Gwen::Controls::Base* pCtrl, int x, int y)
{
//
// We use this global variable to represent our hovered control
@@ -157,21 +153,21 @@ void UpdateHoveredControl( Gwen::Controls::Base* pCtrl, int x, int y )
NewHoveredControl = pCtrl;
// Nothing to change..
if ( DragAndDrop::HoveredControl == NewHoveredControl ) return;
if (DragAndDrop::HoveredControl == NewHoveredControl) return;
// We changed - tell the old hovered control that it's no longer hovered.
if ( DragAndDrop::HoveredControl && DragAndDrop::HoveredControl != NewHoveredControl )
DragAndDrop::HoveredControl->DragAndDrop_HoverLeave( DragAndDrop::CurrentPackage );
if (DragAndDrop::HoveredControl && DragAndDrop::HoveredControl != NewHoveredControl)
DragAndDrop::HoveredControl->DragAndDrop_HoverLeave(DragAndDrop::CurrentPackage);
// If we're hovering where the control came from, just forget it.
// By changing it to NULL here we're not going to show any error cursors
// it will just do nothing if you drop it.
if ( NewHoveredControl == DragAndDrop::SourceControl )
if (NewHoveredControl == DragAndDrop::SourceControl)
NewHoveredControl = NULL;
// Check to see if the new potential control can accept this type of package.
// If not, ignore it and show an error cursor.
while ( NewHoveredControl && !NewHoveredControl->DragAndDrop_CanAcceptPackage( DragAndDrop::CurrentPackage ) )
while (NewHoveredControl && !NewHoveredControl->DragAndDrop_CanAcceptPackage(DragAndDrop::CurrentPackage))
{
// We can't drop on this control, so lets try to drop
// onto its parent..
@@ -179,9 +175,9 @@ void UpdateHoveredControl( Gwen::Controls::Base* pCtrl, int x, int y )
// Its parents are dead. We can't drop it here.
// Show the NO WAY cursor.
if ( !NewHoveredControl )
if (!NewHoveredControl)
{
Platform::SetCursor( CursorType::No );
Platform::SetCursor(CursorType::No);
}
}
@@ -189,15 +185,15 @@ void UpdateHoveredControl( Gwen::Controls::Base* pCtrl, int x, int y )
DragAndDrop::HoveredControl = NewHoveredControl;
// If we exist, tell us that we've started hovering.
if ( DragAndDrop::HoveredControl )
if (DragAndDrop::HoveredControl)
{
DragAndDrop::HoveredControl->DragAndDrop_HoverEnter( DragAndDrop::CurrentPackage, x, y );
DragAndDrop::HoveredControl->DragAndDrop_HoverEnter(DragAndDrop::CurrentPackage, x, y);
}
NewHoveredControl = NULL;
}
void DragAndDrop::OnMouseMoved( Gwen::Controls::Base* pHoveredControl, int x, int y )
void DragAndDrop::OnMouseMoved(Gwen::Controls::Base* pHoveredControl, int x, int y)
{
// Always keep these up to date, they're used to draw the dragged control.
m_iMouseX = x;
@@ -205,34 +201,34 @@ void DragAndDrop::OnMouseMoved( Gwen::Controls::Base* pHoveredControl, int x, in
// If we're not carrying anything, then check to see if we should
// pick up from a control that we're holding down. If not, then forget it.
if ( !CurrentPackage && !ShouldStartDraggingControl( x, y ) )
if (!CurrentPackage && !ShouldStartDraggingControl(x, y))
return;
// Swap to this new hovered control and notify them of the change.
UpdateHoveredControl( pHoveredControl, x, y );
UpdateHoveredControl(pHoveredControl, x, y);
if ( !HoveredControl ) return;
if (!HoveredControl) return;
// Update the hovered control every mouse move, so it can show where
// the dropped control will land etc..
HoveredControl->DragAndDrop_Hover( CurrentPackage, x, y );
HoveredControl->DragAndDrop_Hover(CurrentPackage, x, y);
// Override the cursor - since it might have been set my underlying controls
// Ideally this would show the 'being dragged' control. TODO
Platform::SetCursor( CursorType::Normal );
Platform::SetCursor(CursorType::Normal);
pHoveredControl->Redraw();
}
void DragAndDrop::RenderOverlay( Gwen::Controls::Canvas* /*pCanvas*/, Skin::Base* skin )
void DragAndDrop::RenderOverlay(Gwen::Controls::Canvas* /*pCanvas*/, Skin::Base* skin)
{
if ( !CurrentPackage ) return;
if ( !CurrentPackage->drawcontrol ) return;
if (!CurrentPackage) return;
if (!CurrentPackage->drawcontrol) return;
Gwen::Point pntOld = skin->GetRender()->GetRenderOffset();
skin->GetRender()->AddRenderOffset( Gwen::Rect( m_iMouseX - SourceControl->X() - CurrentPackage->holdoffset.x, m_iMouseY - SourceControl->Y() - CurrentPackage->holdoffset.y, 0, 0 ) );
CurrentPackage->drawcontrol->DoRender( skin );
skin->GetRender()->AddRenderOffset(Gwen::Rect(m_iMouseX - SourceControl->X() - CurrentPackage->holdoffset.x, m_iMouseY - SourceControl->Y() - CurrentPackage->holdoffset.y, 0, 0));
CurrentPackage->drawcontrol->DoRender(skin);
skin->GetRender()->SetRenderOffset( pntOld );
skin->GetRender()->SetRenderOffset(pntOld);
}