eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 05:49:19 +02:00
Code Issues 123 Wiki Activity

Dodane pliki do projektu. Konwersja uilayer na UTF

Browse Source
This commit is contained in:
firleju
2017-03-29 06:18:56 +02:00
parent 1de6e47424
commit f7ece6529f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maszyna.vcxproj
View File

@@ -24,7 +24,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset> <PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
@@ -39,7 +39,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>eu07++d</TargetName> <TargetName>eu07++d</TargetName>
<IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>E:\Gry\MaSzyna_15_04</OutDir> <OutDir>E:\Gry\MaSzyna_15_04\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>eu07++</TargetName> <TargetName>eu07++</TargetName>
@@ -118,6 +118,7 @@
<ClCompile Include="Model3d.cpp" /> <ClCompile Include="Model3d.cpp" />
<ClCompile Include="mtable.cpp" /> <ClCompile Include="mtable.cpp" />
<ClCompile Include="Names.cpp" /> <ClCompile Include="Names.cpp" />
<ClCompile Include="openglmatrixstack.cpp" />
<ClCompile Include="parser.cpp" /> <ClCompile Include="parser.cpp" />
<ClCompile Include="PyInt.cpp" /> <ClCompile Include="PyInt.cpp" />
<ClCompile Include="RealSound.cpp" /> <ClCompile Include="RealSound.cpp" />
@@ -185,6 +186,7 @@
<ClInclude Include="Model3d.h" /> <ClInclude Include="Model3d.h" />
<ClInclude Include="mtable.h" /> <ClInclude Include="mtable.h" />
<ClInclude Include="Names.h" /> <ClInclude Include="Names.h" />
<ClInclude Include="openglmatrixstack.h" />
<ClInclude Include="parser.h" /> <ClInclude Include="parser.h" />
<ClInclude Include="PyInt.h" /> <ClInclude Include="PyInt.h" />
<ClInclude Include="RealSound.h" /> <ClInclude Include="RealSound.h" />

2
uilayer.h
View File

@@ -76,7 +76,7 @@ private:
// members: // members:
GLuint m_fontbase{ -1 }; // numer DL dla znaków w napisach GLuint m_fontbase{ static_cast<GLuint>(-1) }; // numer DL dla znaków w napisach
float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations.
texture_manager::size_type m_background; // path to texture used as the background. size depends on mAspect. texture_manager::size_type m_background; // path to texture used as the background. size depends on mAspect.