Merge pull request #1239 from JACoders/fix-line-fx

Applied proper fix from jaMME for lines disappearing at certain angles
JACoders · Oct 2, 2024 · cb52f9f · cb52f9f
2 parents ad98f60 + 41af0cd
commit cb52f9f
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 0 deletions.
diff --git a/code/cgame/FxPrimitives.cpp b/code/cgame/FxPrimitives.cpp
@@ -762,6 +762,30 @@ bool COrientedParticle::Update()
 //
 //----------------------------
 
+//----------------------------
+bool CLine::Cull( void )
+{
+	vec3_t	dir;
+
+	VectorSubtract( mOrigin1, cg.refdef.vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( cg.refdef.viewaxis[0], dir )) >= 0 )
+	{
+		return false;	//don't cull
+	}
+
+	VectorSubtract( mOrigin2, cg.refdef.vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( cg.refdef.viewaxis[0], dir )) >= 0 )
+	{
+		return false;
+	}
+
+	return true; //all points behind viewer
+}
+
 //----------------------------
 void CLine::Draw()
 {

diff --git a/code/cgame/FxPrimitives.h b/code/cgame/FxPrimitives.h
@@ -360,6 +360,7 @@ class CLine : public CParticle
 	virtual ~CLine() {}
 	virtual void Die() {}
 	virtual bool Update();
+	virtual bool Cull();
 
 
 	inline void SetOrigin2( const vec3_t org2 )	{ VectorCopy( org2, mOrigin2 ); }

diff --git a/codeJK2/cgame/FxPrimitives.cpp b/codeJK2/cgame/FxPrimitives.cpp
@@ -667,6 +667,29 @@ bool COrientedParticle::Update()
 //
 //----------------------------
 
+bool CLine::Cull( void )
+{
+	vec3_t	dir;
+
+	VectorSubtract( mOrigin1, cg.refdef.vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( cg.refdef.viewaxis[0], dir )) >= 0 )
+	{
+		return false;	//don't cull
+	}
+
+	VectorSubtract( mOrigin2, cg.refdef.vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( cg.refdef.viewaxis[0], dir )) >= 0 )
+	{
+		return false;
+	}
+
+	return true; //all points behind viewer
+}
+
 //----------------------------
 void CLine::Draw()
 {

diff --git a/codeJK2/cgame/FxPrimitives.h b/codeJK2/cgame/FxPrimitives.h
@@ -348,6 +348,7 @@ class CLine : public CParticle
 	virtual ~CLine() {}
 	virtual void Die() {}
 	virtual bool Update();
+	virtual bool Cull();
 
 
 	inline void SetOrigin2( const vec3_t org2 )	{ VectorCopy( org2, mOrigin2 ); }

diff --git a/codemp/client/FxPrimitives.cpp b/codemp/client/FxPrimitives.cpp
@@ -750,6 +750,30 @@ CLine::CLine(void)
 	mRefEnt.reType = RT_LINE;
 }
 
+//----------------------------
+bool CLine::Cull( void )
+{
+	vec3_t	dir;
+
+	VectorSubtract( mOrigin1, theFxHelper.refdef->vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( theFxHelper.refdef->viewaxis[0], dir )) >= 0 )
+	{
+		return false;	//don't cull
+	}
+
+	VectorSubtract( mOrigin2, theFxHelper.refdef->vieworg, dir );
+
+	//Check if it's in front of the viewer
+	if ( (DotProduct( theFxHelper.refdef->viewaxis[0], dir )) >= 0 )
+	{
+		return false;
+	}
+
+	return true; //all points behind viewer
+}
+
 //----------------------------
 void CLine::Draw(void)
 {

diff --git a/codemp/client/FxPrimitives.h b/codemp/client/FxPrimitives.h
@@ -401,6 +401,7 @@ class CLine : public CParticle
 	virtual void Die() {}
 
 	virtual bool Update();
+	virtual bool Cull();
 
 	inline void SetOrigin2( vec3_t org2 )	{ VectorCopy( org2, mOrigin2 ); }
 };