Skip to content

Fix cylinder marker has a 2D colshape instead of 3D and Fix collision radius not matching visual #3436

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 17 commits into from
Jul 31, 2025
Merged

Fix cylinder marker has a 2D colshape instead of 3D and Fix collision radius not matching visual #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
31138cf
fix cylinder marker
Proxy-99 Jun 7, 2024
ed79e59
Merge branch 'testing' of https://github.com/Proxy-99/mtasa-blue into…
Proxy-99 Jun 7, 2024
3ea5e92
shapes
Proxy-99 Jun 11, 2024
b43321f
not used
Proxy-99 Jun 11, 2024
9b93b90
adjust float correctly
Proxy-99 Jun 12, 2024
8c05fa6
cleaning
Proxy-99 Jun 12, 2024
94a4622
fixes for size
Proxy-99 Jun 12, 2024
a78e88b
serverside
Proxy-99 Jun 12, 2024
a357ca3
Merge pull request #1 from Proxy-99/colshapes
Proxy-99 Jun 12, 2024
5d08090
function name fixes
Proxy-99 Jun 16, 2024
969e659
simplify formula
Proxy-99 Jun 16, 2024
70195e1
return directly
Proxy-99 Jun 16, 2024
f11ccec
Merge branch 'master' into testing
Proxy-99 Jul 4, 2024
b98da24
Merge branch 'master' into testing
Proxy-99 Oct 4, 2024
85c41fa
Merge branch 'master' into testing
Proxy-99 Apr 27, 2025
fff1ace
Merge branch 'master' into testing
tederis May 13, 2025
5270058
Fix source code
botder Jul 31, 2025
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
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CClientColTube.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CClientColTube final : public CClientColShape
float GetRadius() { return m_fRadius; };
void SetRadius(float fRadius)
{
m_fRadius = fRadius;
m_fRadius = (fRadius / 2.0f) + 0.15f;
SizeChanged();
};
float GetHeight() { return m_fHeight; };
Expand Down
11 changes: 10 additions & 1 deletion Client/mods/deathmatch/logic/CClientMarker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,15 @@ void CClientMarker::SetSize(float fSize)
pShape->SetRadius(fSize);
break;
}
case COLSHAPE_TUBE:
{
CClientColTube* pShape = static_cast<CClientColTube*>(m_pCollision);
pShape->SetRadius(fSize);
pShape->SetHeight(fSize);
break;
}
}

m_pMarker->SetSize(fSize);
}

Expand Down Expand Up @@ -469,7 +477,8 @@ void CClientMarker::CreateOfType(int iType)
CClient3DMarker* p3DMarker = new CClient3DMarker(this);
p3DMarker->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
m_pMarker = p3DMarker;
m_pCollision = new CClientColCircle(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize());

m_pCollision = new CClientColTube(g_pClientGame->GetManager(), INVALID_ELEMENT_ID, vecOrigin, GetSize(), GetSize());
m_pCollision->m_pOwningMarker = this;
m_pCollision->SetHitCallback(this);
break;
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CColTube.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CColTube : public CColShape
float GetRadius() { return m_fRadius; };
void SetRadius(float fRadius)
{
m_fRadius = fRadius;
m_fRadius = (fRadius / 2.0f) + 0.15f;
SizeChanged();
};
float GetHeight() { return m_fHeight; };
Expand Down
16 changes: 15 additions & 1 deletion Server/mods/deathmatch/logic/CMarker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "CMarkerManager.h"
#include "CColCircle.h"
#include "CColSphere.h"
#include "CColTube.h"
#include "CResource.h"
#include "CLogger.h"
#include "Utils.h"
Expand Down Expand Up @@ -398,11 +399,18 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType)

m_pCollision = new CColCircle(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
}
else if (ucOldType == CMarker::TYPE_CHECKPOINT)
else if (m_ucType == CMarker::TYPE_CYLINDER)
{
if (m_pCollision)
g_pGame->GetElementDeleter()->Delete(m_pCollision);

m_pCollision = new CColTube(m_pColManager, nullptr, m_vecPosition, m_fSize, m_fSize);
}
else if (ucOldType == CMarker::TYPE_CHECKPOINT)
{
if (m_pCollision)
g_pGame->GetElementDeleter()->Delete(m_pCollision);

m_pCollision = new CColSphere(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
}

Expand All @@ -416,6 +424,12 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType)
{
static_cast<CColCircle*>(m_pCollision)->SetRadius(m_fSize);
}
else if (m_ucType == CMarker::TYPE_CYLINDER)
{
CColTube* pShape = static_cast<CColTube*>(m_pCollision);
pShape->SetRadius(m_fSize);
pShape->SetHeight(m_fSize);
}
else
{
static_cast<CColSphere*>(m_pCollision)->SetRadius(m_fSize);
Expand Down
Loading