Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compilation

Browse source
This commit is contained in:
Ian Curtis 2016-05-03 18:38:06 +00:00
parent fa65542d76
commit 6d1aa4d527
5 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Src/Graphics/Legacy3D/Models.cpp
View file

@ -949,7 +949,7 @@ struct VBORef *CLegacy3D::CacheModel(ModelCache *Cache, int lutIdx, UINT16 texOf
P.Vert[j].n[2] = (GLfloat)(INT8)(iz&0xFF); P.Vert[j].n[2] = (GLfloat)(INT8)(iz&0xFF);
P.Vert[j].u = (GLfloat) ((UINT16)(it>>16)) * uvScale; // TO-DO: might these be signed? P.Vert[j].u = (GLfloat) ((UINT16)(it>>16)) * uvScale; // TO-DO: might these be signed?
P.Vert[j].v = (GLfloat) ((UINT16)(it&0xFFFF)) * uvScale; P.Vert[j].v = (GLfloat) ((UINT16)(it&0xFFFF)) * uvScale;
P.Vert[j].intensity = GLfloat((ix + 128) & 0xFF) / 255.0; // signed (-0.5 -> black, +0.5 -> white) P.Vert[j].intensity = GLfloat((ix + 128) & 0xFF) / 255.0f; // signed (-0.5 -> black, +0.5 -> white)
//if ((P.header[1] & 0x20) && !(P.header[1] & 0x08)) //if ((P.header[1] & 0x20) && !(P.header[1] & 0x08))
// printf("%02x %02x %02x\n", ix&0xff, iy&0xff, iz&0xff); // printf("%02x %02x %02x\n", ix&0xff, iy&0xff, iz&0xff);
data += 4; data += 4;

2
Src/Model3/Model3.cpp
View file

@ -1911,7 +1911,7 @@ void CModel3::LoadState(CBlockFile *SaveState)
SaveState->Read(&midiCtrlPort, sizeof(midiCtrlPort)); SaveState->Read(&midiCtrlPort, sizeof(midiCtrlPort));
int32_t securityFirstRead; int32_t securityFirstRead;
SaveState->Write(&securityFirstRead, sizeof(securityFirstRead)); SaveState->Write(&securityFirstRead, sizeof(securityFirstRead));
m_securityFirstRead = securityFirstRead; m_securityFirstRead = securityFirstRead != 0;
// All devices... // All devices...
GPU.LoadState(SaveState); GPU.LoadState(SaveState);

4
Src/Util/BMPFile.h
View file

@ -74,7 +74,7 @@ namespace Util
struct RGBA8 struct RGBA8
{ {
static constexpr const unsigned bytes_per_pixel = 4; static const unsigned bytes_per_pixel = 4;
static inline uint8_t GetRed(const uint8_t *pixel) static inline uint8_t GetRed(const uint8_t *pixel)
{ {
return pixel[0]; return pixel[0];
@ -95,7 +95,7 @@ namespace Util
struct A1RGB5 struct A1RGB5
{ {
static constexpr const unsigned bytes_per_pixel = 2; static const unsigned bytes_per_pixel = 2;
static inline uint8_t GetRed(const uint8_t *pixel) static inline uint8_t GetRed(const uint8_t *pixel)
{ {
return uint8_t((255.0f / 31.0f) * float((*reinterpret_cast<const uint16_t *>(pixel) >> 10) & 0x1f)); return uint8_t((255.0f / 31.0f) * float((*reinterpret_cast<const uint16_t *>(pixel) >> 10) & 0x1f));

1
VS2008/Supermodel.vcxproj
View file

@ -444,7 +444,6 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\Src\Util\BMPFile.cpp" />
<ClCompile Include="..\Src\Util\Format.cpp" /> <ClCompile Include="..\Src\Util\Format.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
VS2008/Supermodel.vcxproj.filters
View file

@ -425,9 +425,6 @@
<ClCompile Include="..\Src\Util\Format.cpp"> <ClCompile Include="..\Src\Util\Format.cpp">
<Filter>Source Files\Util</Filter> <Filter>Source Files\Util</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Src\Util\BMPFile.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm"> <MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm">