Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 18, 2019, 4:05:35 PM (5 years ago)
Author:
mkarpf
Message:

example level weiterentwickelt
mousapi addobject korrigiert

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc

    r12309 r12311  
    9797ClickableObjectID MouseAPI::addClickableObject(const Vector3& position, float radius, const std::list<MouseButtonCode::ByEnum>& buttons, std::function<void(MouseButtonCode::ByEnum)> onClickedFunction)
    9898{
    99     clickEvents.insert(clickEvents.begin(),{!clickEvents.empty() ? clickEvents.back().id + 1:0,position,radius,buttons,onClickedFunction});
    100     return clickEvents.back().id;
     99    ClickableObjectID id = !clickEvents.empty() ? clickEvents.back().id + 1:0;
     100    clickEvents.insert(clickEvents.end(),{id,position,radius,buttons,onClickedFunction});
     101    return id;
    101102}
    102103ScrollableElementID MouseAPI::addScrollElement(const Vector3& position, float radius, std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction)
    103104{
    104     scrollEvents.insert(scrollEvents.begin(),{!scrollEvents.empty() ? scrollEvents.back().id + 1:0,position,radius,onScrolledFunction});
    105     return scrollEvents.back().id;
     105    ScrollableElementID id = !scrollEvents.empty() ? scrollEvents.back().id + 1:0;
     106    scrollEvents.insert(scrollEvents.end(),{id,position,radius,onScrolledFunction});
     107    return id;
    106108}
    107109ScrollableElementID MouseAPI::addScrollElement(std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction)
    108110{
    109     scrollEvents.insert(scrollEvents.begin(),{!scrollEvents.empty() ? scrollEvents.back().id + 1:0,onScrolledFunction});
    110     return scrollEvents.back().id;
     111    ScrollableElementID id = !scrollEvents.empty() ? scrollEvents.back().id + 1:0;
     112    scrollEvents.insert(scrollEvents.end(),{id,onScrolledFunction});
     113    return id;
    111114}
    112115
Note: See TracChangeset for help on using the changeset viewer.