File tree Expand file tree Collapse file tree 4 files changed +12
-10
lines changed
Expand file tree Collapse file tree 4 files changed +12
-10
lines changed Original file line number Diff line number Diff line change 8484 <AdditionalIncludeDirectories >C:\Users\sidhi\Desktop\Projects\GameMenu\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
8585 </ClCompile >
8686 <Link >
87- <AdditionalLibraryDirectories >C:\Users\sidhi\libraries\SFML-2.4.1\lib;C:\Users\sidhi\Desktop\Projects\GameMenu\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
88- <AdditionalDependencies >sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;GameMenu .lib;%(AdditionalDependencies)</AdditionalDependencies >
87+ <AdditionalLibraryDirectories >C:\Users\sidhi\libraries\SFML-2.4.1\lib;C:\Users\sidhi\Desktop\Projects\GameMenu\lib\ x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
88+ <AdditionalDependencies >GameMenu.lib; sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;%(AdditionalDependencies)</AdditionalDependencies >
8989 </Link >
9090 </ItemDefinitionGroup >
9191 <ItemDefinitionGroup Condition =" '$(Configuration)|$(Platform)'=='Release|Win32'" >
113113 <Link >
114114 <EnableCOMDATFolding >true</EnableCOMDATFolding >
115115 <OptimizeReferences >true</OptimizeReferences >
116- <AdditionalLibraryDirectories >C:\Users\sidhi\libraries\SFML-2.4.1\lib;C:\Users\sidhi\Desktop\Projects\GameMenu\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
117- <AdditionalDependencies >sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;GameMenu .lib;%(AdditionalDependencies)</AdditionalDependencies >
116+ <AdditionalLibraryDirectories >C:\Users\sidhi\libraries\SFML-2.4.1\lib;C:\Users\sidhi\Desktop\Projects\GameMenu\lib\ x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
117+ <AdditionalDependencies >GameMenu.lib; sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;%(AdditionalDependencies)</AdditionalDependencies >
118118 </Link >
119119 </ItemDefinitionGroup >
120120 <ItemGroup >
Original file line number Diff line number Diff line change 11#include " GameMenu\GameMenu.h"
22#include < SFML\Graphics.hpp>
3+ #include < memory>
34
45namespace test {
56 class testAction : public gmenu ::Action {
@@ -18,10 +19,10 @@ void main() {
1819 sf::Font font;
1920 font.loadFromFile ( " sansation.ttf" );
2021 gmenu::Style style ( font, font );
21- style.layout = gmenu::Layout::TitleCentre;
22+ style.layout = gmenu::Layout::TitleCentre|gmenu::Layout::ItemRight ;
2223 for ( int i = 0 ; i < 3 ; ++i ) {
2324 item.title = text[i];
24- item.action = new test::testAction ();
25+ item.action = std::make_shared < test::testAction> ();
2526 itemList.push_back ( item );
2627 }
2728 gmenu::Menu menu ( w, " Sample Menu" , itemList, style );
Original file line number Diff line number Diff line change 1010
1111/* --- Headers ---*/
1212#include < SFML/Graphics.hpp>
13+ #include < memory>
1314namespace gmenu {
1415
1516
@@ -28,7 +29,7 @@ namespace gmenu {
2829 };
2930
3031 struct MenuItem {
31- Action * action;
32+ std::shared_ptr< Action> action;
3233 std::string title;
3334 };
3435
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ namespace gmenu {
3030 setMenu ();
3131 bool cont = true ;
3232 while (window.isOpen () && cont)
33- {
33+ {
3434 sf::Event event;
3535 while (window.pollEvent (event)) {
3636 if (event.type == sf::Event::Closed)
@@ -43,7 +43,7 @@ namespace gmenu {
4343 currently_selected_item = (currently_selected_item + 1 ) % (menuItems.size ());
4444 }
4545 else if (event.key .code == sf::Keyboard::Return) {
46- cont = menuItems[ currently_selected_item] .action ->start ();
46+ cont = menuItems. at ( currently_selected_item) .action ->start ();
4747 }
4848 }
4949 } // while( pollEvent )
@@ -85,7 +85,7 @@ namespace gmenu {
8585 /* Setting title of menu */
8686 {
8787 /* Small scope just to be able to freely use the variable names */
88- int offset_coefficient = 0.5 ;
88+ float offset_coefficient = 0.5 ;
8989 if ( style.layout & Layout::TitleCentre == Layout::TitleCentre ) offset_coefficient = 0.5 ;
9090 else if ( style.layout & Layout::TitleLeft == Layout::TitleLeft ) offset_coefficient = 0.25 ;
9191 else if ( style.layout & Layout::TitleRight == Layout::TitleRight ) offset_coefficient = 0.75 ;
You can’t perform that action at this time.
0 commit comments