Skip to content

Fix #1581: dxDrawPrimitive wrong colors with alpha <255 #1595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2020
Merged

Fix #1581: dxDrawPrimitive wrong colors with alpha <255 #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ int CLuaDrawingDefs::DxDrawPrimitive3D(lua_State* luaVM)
argStream.ReadEnumString(ePrimitiveType);
argStream.ReadBool(bPostGUI, false);

std::vector<float> vecTableContent;
std::vector<double> vecTableContent;

while (argStream.NextIsTable())
{
Expand All @@ -591,10 +591,12 @@ int CLuaDrawingDefs::DxDrawPrimitive3D(lua_State* luaVM)
switch (vecTableContent.size())
{
case Primitive3DVerticeSizes::VERT_XYZ:
pVecVertices->push_back(PrimitiveVertice{vecTableContent[0], vecTableContent[1], vecTableContent[2], (DWORD)0xFFFFFFFF});
pVecVertices->push_back(PrimitiveVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]),
static_cast<float>(vecTableContent[2]), (DWORD)0xFFFFFFFF});
break;
case Primitive3DVerticeSizes::VERT_XYZ_COLOR:
pVecVertices->push_back(PrimitiveVertice{vecTableContent[0], vecTableContent[1], vecTableContent[2], static_cast<DWORD>(static_cast<int64_t>(vecTableContent[3]))});
pVecVertices->push_back(PrimitiveVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]),
static_cast<float>(vecTableContent[2]), static_cast<DWORD>(static_cast<int64_t>(vecTableContent[3]))});
break;
default:
argStream.SetCustomError(SString("Expected table with 3 or 4 numbers, got %i numbers", vecTableContent.size()).c_str());
Expand Down Expand Up @@ -631,7 +633,7 @@ int CLuaDrawingDefs::DxDrawMaterialPrimitive3D(lua_State* luaVM)
MixedReadMaterialString(argStream, pMaterialElement);
argStream.ReadBool(bPostGUI, false);

std::vector<float> vecTableContent;
std::vector<double> vecTableContent;

while (argStream.NextIsTable())
{
Expand All @@ -641,12 +643,15 @@ int CLuaDrawingDefs::DxDrawMaterialPrimitive3D(lua_State* luaVM)
switch (vecTableContent.size())
{
case Primitive3DVerticeSizes::VERT_XYZ_UV:
pVecVertices->push_back(PrimitiveMaterialVertice{vecTableContent[0], vecTableContent[1], vecTableContent[2], (DWORD)0xFFFFFFFF,
vecTableContent[3], vecTableContent[4]});
pVecVertices->push_back(PrimitiveMaterialVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]),
static_cast<float>(vecTableContent[2]), (DWORD)0xFFFFFFFF,
static_cast<float>(vecTableContent[3]), static_cast<float>(vecTableContent[4])});
break;
case Primitive3DVerticeSizes::VERT_XYZ_COLOR_UV:
pVecVertices->push_back(PrimitiveMaterialVertice{vecTableContent[0], vecTableContent[1], vecTableContent[2],
static_cast<DWORD>(static_cast<int64_t>(vecTableContent[3])), vecTableContent[4], vecTableContent[5]});
pVecVertices->push_back(PrimitiveMaterialVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]),
static_cast<float>(vecTableContent[2]),
static_cast<DWORD>(static_cast<int64_t>(vecTableContent[3])),
static_cast<float>(vecTableContent[4]), static_cast<float>(vecTableContent[5])});
break;
default:
argStream.SetCustomError(SString("Expected table with 5 or 6 numbers, got %i numbers", vecTableContent.size()).c_str());
Expand Down Expand Up @@ -681,7 +686,7 @@ int CLuaDrawingDefs::DxDrawPrimitive(lua_State* luaVM)
argStream.ReadEnumString(ePrimitiveType);
argStream.ReadBool(bPostGUI);

std::vector<float> vecTableContent;
std::vector<double> vecTableContent;

while (argStream.NextIsTable())
{
Expand All @@ -691,10 +696,11 @@ int CLuaDrawingDefs::DxDrawPrimitive(lua_State* luaVM)
switch (vecTableContent.size())
{
case PrimitiveVerticeSizes::VERT_XY:
pVecVertices->push_back(PrimitiveVertice{vecTableContent[0], vecTableContent[1], 0, (DWORD)0xFFFFFFFF});
pVecVertices->push_back(PrimitiveVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]), 0, (DWORD)0xFFFFFFFF});
break;
case PrimitiveVerticeSizes::VERT_XY_COLOR:
pVecVertices->push_back(PrimitiveVertice{vecTableContent[0], vecTableContent[1], 0, static_cast<DWORD>(static_cast<int64_t>(vecTableContent[2]))});
pVecVertices->push_back(PrimitiveVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]), 0,
static_cast<DWORD>(static_cast<int64_t>(vecTableContent[2]))});
break;
default:
argStream.SetCustomError(SString("Expected table with 2 or 3 numbers, got %i numbers", vecTableContent.size()).c_str());
Expand Down Expand Up @@ -731,7 +737,7 @@ int CLuaDrawingDefs::DxDrawMaterialPrimitive(lua_State* luaVM)
MixedReadMaterialString(argStream, pMaterialElement);
argStream.ReadBool(bPostGUI);

std::vector<float> vecTableContent;
std::vector<double> vecTableContent;

while (argStream.NextIsTable())
{
Expand All @@ -741,12 +747,14 @@ int CLuaDrawingDefs::DxDrawMaterialPrimitive(lua_State* luaVM)
switch (vecTableContent.size())
{
case PrimitiveVerticeSizes::VERT_XY_UV:
pVecVertices->push_back(
PrimitiveMaterialVertice{vecTableContent[0], vecTableContent[1], 0, (DWORD)0xFFFFFFFF, vecTableContent[2], vecTableContent[3]});
pVecVertices->push_back(PrimitiveMaterialVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]), 0,
(DWORD)0xFFFFFFFF, static_cast<float>(vecTableContent[2]),
static_cast<float>(vecTableContent[3])});
break;
case PrimitiveVerticeSizes::VERT_XY_COLOR_UV:
pVecVertices->push_back(PrimitiveMaterialVertice{vecTableContent[0], vecTableContent[1], 0, static_cast<DWORD>(static_cast<int64_t>(vecTableContent[2])),
vecTableContent[3], vecTableContent[4]});
pVecVertices->push_back(PrimitiveMaterialVertice{static_cast<float>(vecTableContent[0]), static_cast<float>(vecTableContent[1]), 0,
static_cast<DWORD>(static_cast<int64_t>(vecTableContent[2])),
static_cast<float>(vecTableContent[3]), static_cast<float>(vecTableContent[4])});
break;
default:
argStream.SetCustomError(SString("Expected table with 4 or 5 numbers, got %i numbers", vecTableContent.size()).c_str());
Expand Down
8 changes: 4 additions & 4 deletions Shared/sdk/CScriptArgReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,10 +1027,10 @@ class CScriptArgReader
}

//
// Reads a table of floating point numbers
// Taken from CrosRoad95 dxDrawPrimitive pull request
// Reads a table of numbers
//
void ReadNumberTable(std::vector<float>& outList)
template <typename T>
void ReadNumberTable(std::vector<T>& outList)
{
outList.clear();
int iArgument = lua_type(m_luaVM, m_iIndex);
Expand All @@ -1041,7 +1041,7 @@ class CScriptArgReader
int iArgument = lua_type(m_luaVM, -1);
if (iArgument == LUA_TNUMBER)
{
outList.push_back(static_cast<float>(lua_tonumber(m_luaVM, -1)));
outList.push_back(static_cast<T>(lua_tonumber(m_luaVM, -1)));
}
}
m_iIndex++;
Expand Down