WIP

SNMetamorph · Feb 29, 2024 · 1df2ec9 · 1df2ec9
1 parent 4f112dc
commit 1df2ec9
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 3 deletions.
diff --git a/game_shared/bone_setup.cpp b/game_shared/bone_setup.cpp
@@ -2265,10 +2265,33 @@ void CStudioBoneSetup :: CalcBoneAdj( Vector pos[], Vector4D q[], const byte con
 		{
 			i = pbonecontroller->index;
 
+#if 1
 			if( i == STUDIO_MOUTH )
 				value = bound( 0.0f, ( mouthopen / 64.0f ), 1.0f );				
 			else value = bound( 0.0f, (float)controllers[i] / 255.0f, 1.0f );
-			value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+#else
+			if (i != STUDIO_MOUTH) 
+			{
+				//value = bound(0.0f, (float)controllers[i] / 255.0f, 1.0f);
+				//value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+				if (pbonecontroller->type & STUDIO_RLOOP)
+				{
+					value = controllers[j] * (360.0/256.0) + pbonecontroller->start;
+				}
+				else 
+				{
+					value = controllers[j] / 255.0;
+					if (value < 0) value = 0;
+					if (value > 1.0) value = 1.0;
+					value = (1.0 - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
+				}
+			}
+			else 
+			{
+				value = bound(0.0f, (mouthopen / 64.0f), 1.0f);
+				value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+			}
+#endif
 
 			switch( pbonecontroller->type & STUDIO_TYPES )
 			{
@@ -2319,10 +2342,33 @@ void CStudioBoneSetup :: CalcBoneAdj( float adj[], const byte controllers[], byt
 		{
 			i = pbonecontroller->index;
 
+#if 1
 			if( i == STUDIO_MOUTH )
 				value = bound( 0.0f, ( mouthopen / 64.0f ), 1.0f );				
 			else value = bound( 0.0f, (float)controllers[i] / 255.0f, 1.0f );
-			value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+#else
+			if (i != STUDIO_MOUTH) 
+			{
+				//value = bound(0.0f, (float)controllers[i] / 255.0f, 1.0f);
+				//value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+				if (pbonecontroller->type & STUDIO_RLOOP)
+				{
+					value = controllers[j] * (360.0/256.0) + pbonecontroller->start;
+				}
+				else 
+				{
+					value = controllers[j] / 255.0;
+					if (value < 0) value = 0;
+					if (value > 1.0) value = 1.0;
+					value = (1.0 - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
+				}
+			}
+			else 
+			{
+				value = bound(0.0f, (mouthopen / 64.0f), 1.0f);
+				value = (1.0f - value) * pbonecontroller->start + value * pbonecontroller->end;
+			}
+#endif
 
 			switch( pbonecontroller->type & STUDIO_TYPES )
 			{

diff --git a/server/monsters/animating.cpp b/server/monsters/animating.cpp
@@ -164,8 +164,8 @@ float CBaseAnimating :: StudioGaitFrameAdvance( void )
 	pev->controller[3] = iTorsoAdjust;
 
 	SetBlending( 0, (pev->angles[PITCH] * 3.0f));
-	pev->angles[YAW] = m_flGaitYaw;
 
+	pev->angles[YAW] = m_flGaitYaw;
 	if( pev->angles[YAW] < -0.0f )
 		pev->angles[YAW] += 360.0f;