Skip to content

Commit 2fdd3fe

Browse files
fallahnfallahn
committed
add conversion operator to tmx::Colour
1 parent cb2510e commit 2fdd3fe

4 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎ParseTest/ParseTest.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v142</PlatformToolset>
30+
<PlatformToolset>v143</PlatformToolset>
3131
<CharacterSet>MultiByte</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
<WholeProgramOptimization>true</WholeProgramOptimization>
3838
<CharacterSet>MultiByte</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4141
<ConfigurationType>Application</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>v142</PlatformToolset>
43+
<PlatformToolset>v143</PlatformToolset>
4444
<CharacterSet>MultiByte</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>MultiByte</CharacterSet>
5252
</PropertyGroup>

‎SFMLExample/SFMLExample.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎tmxlite/include/tmxlite/Types.hpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ namespace tmx
125125
{
126126
return !(*this == other);
127127
}
128+
129+
explicit operator std::uint32_t() const
130+
{
131+
return (r << 24) | (g << 16) | (b << 8) | a;
132+
}
128133
};
129134
}
130135

‎tmxlite/tmxlite.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,52 @@
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'" Label="Configuration">
4444
<ConfigurationType>StaticLibrary</ConfigurationType>
4545
<UseDebugLibraries>true</UseDebugLibraries>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
<CharacterSet>MultiByte</CharacterSet>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugShared|Win32'" Label="Configuration">
5050
<ConfigurationType>DynamicLibrary</ConfigurationType>
5151
<UseDebugLibraries>true</UseDebugLibraries>
52-
<PlatformToolset>v142</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
5656
<ConfigurationType>StaticLibrary</ConfigurationType>
5757
<UseDebugLibraries>false</UseDebugLibraries>
58-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
<WholeProgramOptimization>true</WholeProgramOptimization>
6060
<CharacterSet>MultiByte</CharacterSet>
6161
</PropertyGroup>
6262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseShared|Win32'" Label="Configuration">
6363
<ConfigurationType>DynamicLibrary</ConfigurationType>
6464
<UseDebugLibraries>false</UseDebugLibraries>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
<WholeProgramOptimization>true</WholeProgramOptimization>
6767
<CharacterSet>MultiByte</CharacterSet>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'" Label="Configuration">
7070
<ConfigurationType>StaticLibrary</ConfigurationType>
7171
<UseDebugLibraries>true</UseDebugLibraries>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<CharacterSet>MultiByte</CharacterSet>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugShared|x64'" Label="Configuration">
7676
<ConfigurationType>DynamicLibrary</ConfigurationType>
7777
<UseDebugLibraries>true</UseDebugLibraries>
78-
<PlatformToolset>v142</PlatformToolset>
78+
<PlatformToolset>v143</PlatformToolset>
7979
<CharacterSet>MultiByte</CharacterSet>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
8282
<ConfigurationType>StaticLibrary</ConfigurationType>
8383
<UseDebugLibraries>false</UseDebugLibraries>
84-
<PlatformToolset>v142</PlatformToolset>
84+
<PlatformToolset>v143</PlatformToolset>
8585
<WholeProgramOptimization>true</WholeProgramOptimization>
8686
<CharacterSet>MultiByte</CharacterSet>
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseShared|x64'" Label="Configuration">
8989
<ConfigurationType>DynamicLibrary</ConfigurationType>
9090
<UseDebugLibraries>false</UseDebugLibraries>
91-
<PlatformToolset>v142</PlatformToolset>
91+
<PlatformToolset>v143</PlatformToolset>
9292
<WholeProgramOptimization>true</WholeProgramOptimization>
9393
<CharacterSet>MultiByte</CharacterSet>
9494
</PropertyGroup>

0 commit comments

Comments
 (0)