Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed carousel pull request with Visual Studio.

Browse Source
This commit is contained in:
xawotihs
2013-12-07 20:29:42 +01:00
parent aaceb3c038
commit ee217e94a8
6 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb
View File

Binary file not shown.

BIN
JGE/Dependencies/lib/libjpeg-static-mt.pdb
View File

Binary file not shown.

4
projects/mtg/include/Easing.h
View File

@@ -187,12 +187,12 @@ public:
float time_tmp = (time_acc * 2) / duration;
if (time_tmp < 1)
{
value = delta_value * 0.5 * time_tmp * time_tmp + start_value;
value = (float)(delta_value * 0.5 * time_tmp * time_tmp + start_value);
}
else
{
time_tmp -= 1;
value = - delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value;
value = (float)(- delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value);
}
}
};

2
projects/mtg/src/CarouselDeckView.cpp
View File

@@ -141,7 +141,7 @@ MTGCard * CarouselDeckView::Click(int x, int y)
void CarouselDeckView::changePosition(int offset)
{
mScrollEasing.start(offset, 0.3f*abs(offset));
mScrollEasing.start((float)offset, (float)(0.3f*abs(offset)));
last_user_activity = 0;
}

22
projects/mtg/template.vcxproj
View File

@@ -318,6 +318,12 @@
<ClCompile Include="src\CardPrimitive.cpp" />
<ClCompile Include="src\CardSelector.cpp" />
<ClCompile Include="src\CardSelectorSingleton.cpp" />
<ClCompile Include="src\CarouselDeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\Counters.cpp" />
<ClCompile Include="src\Credits.cpp" />
<ClCompile Include="src\Damage.cpp" />
@@ -329,6 +335,12 @@
<ClCompile Include="src\DeckMenuItem.cpp" />
<ClCompile Include="src\DeckMetaData.cpp" />
<ClCompile Include="src\DeckStats.cpp" />
<ClCompile Include="src\DeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\DuelLayers.cpp" />
<ClCompile Include="src\ExtraCost.cpp" />
<ClCompile Include="src\GameApp.cpp">
@@ -362,6 +374,12 @@
<ClCompile Include="src\GameStateShop.cpp" />
<ClCompile Include="src\GameStateStory.cpp" />
<ClCompile Include="src\GameStateTransitions.cpp" />
<ClCompile Include="src\GridDeckView.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='HQ Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\GuiAvatars.cpp" />
<ClCompile Include="src\GuiBackground.cpp" />
<ClCompile Include="src\GuiCardsController.cpp" />
@@ -459,6 +477,7 @@
<ClInclude Include="include\CardPrimitive.h" />
<ClInclude Include="include\CardSelector.h" />
<ClInclude Include="include\CardSelectorSingleton.h" />
<ClInclude Include="include\CarouselDeckView.h" />
<ClInclude Include="include\config.h" />
<ClInclude Include="include\Counters.h" />
<ClInclude Include="include\Credits.h" />
@@ -471,7 +490,9 @@
<ClInclude Include="include\DeckMenuItem.h" />
<ClInclude Include="include\DeckMetaData.h" />
<ClInclude Include="include\DeckStats.h" />
<ClInclude Include="include\DeckView.h" />
<ClInclude Include="include\DuelLayers.h" />
<ClInclude Include="include\Easing.h" />
<ClInclude Include="include\Effects.h" />
<ClInclude Include="include\ExtraCost.h" />
<ClInclude Include="include\GameApp.h" />
@@ -486,6 +507,7 @@
<ClInclude Include="include\GameStateShop.h" />
<ClInclude Include="include\GameStateStory.h" />
<ClInclude Include="include\GameStateTransitions.h" />
<ClInclude Include="include\GridDeckView.h" />
<ClInclude Include="include\GuiAvatars.h" />
<ClInclude Include="include\GuiBackground.h" />
<ClInclude Include="include\GuiCardsController.h" />

21
projects/mtg/template.vcxproj.filters
View File

@@ -331,6 +331,15 @@
<ClCompile Include="src\NetworkPlayer.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CarouselDeckView.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\DeckView.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\GridDeckView.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\ActionElement.h">
@@ -681,6 +690,18 @@
<ClInclude Include="include\NetworkPlayer.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\CarouselDeckView.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\DeckView.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\Easing.h">
<Filter>inc</Filter>
</ClInclude>
<ClInclude Include="include\GridDeckView.h">
<Filter>inc</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Makefile" />