1 files changed, 91 insertions, 11 deletions

diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index b2fcfbc7..ed432e77 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -1,10 +1,10 @@
 #include "common.h"
 
-#include "VuVector.h"
 #include "General.h"
 #include "RwHelper.h"
 #include "ModelIndices.h"
 #include "Timer.h"
+#include "Streaming.h"
 #include "Entity.h"
 #include "Object.h"
 #include "World.h"
@@ -27,6 +27,12 @@
 #include "Dummy.h"
 #include "WindModifiers.h"
 #include "SaveBuf.h"
+#include "SpecialFX.h"
+#include "VisibilityPlugins.h"
+#include "RpAnimBlend.h"
+#include "CutsceneMgr.h"
+
+//--LCS: file done except TODO for distance alpha
 
 int gBuildings;
 
@@ -79,6 +85,11 @@ CEntity::CEntity(void)
 	bUnderwater = false;
 	bHasPreRenderEffects = false;
 
+	bIsTreeModel = false;
+	bIsVehicle = false;
+	bIsPed = false;
+	bMakeVisible = false;
+
 	m_scanCode = 0;
 	m_modelIndex = -1;
 	m_rwObject = nil;
@@ -97,6 +108,8 @@ void
 CEntity::SetModelIndex(uint32 id)
 {
 	m_modelIndex = id;
+	bIsTreeModel = IsTreeModel(m_modelIndex);
+	bDrawLast |= bIsTreeModel;
 	bHasPreRenderEffects = HasPreRenderEffects();
 	CreateRwObject();
 }
@@ -105,6 +118,8 @@ void
 CEntity::SetModelIndexNoCreate(uint32 id)
 {
 	m_modelIndex = id;
+	bIsTreeModel = IsTreeModel(m_modelIndex);
+	bDrawLast |= bIsTreeModel;
 	bHasPreRenderEffects = HasPreRenderEffects();
 }
 
@@ -127,6 +142,7 @@ CEntity::CreateRwObject(void)
 		else if(RwObjectGetType(m_rwObject) == rpCLUMP)
 			GetMatrix().AttachRW(RwFrameGetMatrix(RpClumpGetFrame((RpClump *)m_rwObject)), false);
 
+		// useless IsTextureLoaded();
 		mi->AddRef();
 	}
 }
@@ -183,9 +199,11 @@ CEntity::DeleteRwObject(void)
 	if(m_rwObject){
 		if(RwObjectGetType(m_rwObject) == rpATOMIC){
 			f = RpAtomicGetFrame((RpAtomic*)m_rwObject);
+			CStreaming::UnregisterInstance((RpAtomic*)m_rwObject, nil);
 			RpAtomicDestroy((RpAtomic*)m_rwObject);
 			RwFrameDestroy(f);
 		}else if(RwObjectGetType(m_rwObject) == rpCLUMP){
+			CStreaming::UnregisterInstance((RpClump*)m_rwObject);
 			if(IsClumpSkinned((RpClump*)m_rwObject))
 				RpClumpForAllAtomics((RpClump*)m_rwObject, AtomicRemoveAnimFromSkinCB, nil);
 			RpClumpDestroy((RpClump*)m_rwObject);
@@ -251,9 +269,18 @@ CEntity::UpdateRwFrame(void)
 		RwFrameUpdateObjects((RwFrame*)rwObjectGetParent(m_rwObject));
 }
 
+bool
+PauseEntityAnims(void)
+{
+	return CSpecialFX::bSnapShotActive;
+}
+
 void
 CEntity::UpdateRpHAnim(void)
 {
+	if(PauseEntityAnims())
+		return;
+
 	if(IsClumpSkinned(GetClump())){
 		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
 		RpHAnimHierarchyUpdateMatrices(hier);
@@ -315,9 +342,10 @@ CEntity::PreRender(void)
 	if(!bHasPreRenderEffects)
 		return;
 
+	// separate function in LCS but we don't know the name
 	switch(m_type){
 	case ENTITY_TYPE_BUILDING:
-		if(IsTreeModel(GetModelIndex())){
+		if(bIsTreeModel){
 			float dist = (TheCamera.GetPosition() - GetPosition()).Magnitude2D();
 			CObject::fDistToNearestTree = Min(CObject::fDistToNearestTree, dist);
 			ModifyMatrixForTreeInWind();
@@ -416,12 +444,53 @@ void
 CEntity::Render(void)
 {
 	if(m_rwObject){
-		bImBeingRendered = true;
-		if(RwObjectGetType(m_rwObject) == rpATOMIC)
-			RpAtomicRender((RpAtomic*)m_rwObject);
-		else
-			RpClumpRender((RpClump*)m_rwObject);
-		bImBeingRendered = false;
+#ifdef VIS_DISTANCE_ALPHA
+		if(CVisibilityPlugins::GetObjectDistanceAlpha(m_rwObject) != 0)
+#endif
+		{
+			// TODO(LCS): LCS does not use bImBeingRendered here,
+			// but that may be due to the streamed world. better keep it for safety
+			bImBeingRendered = true;
+			if(RwObjectGetType(m_rwObject) == rpATOMIC)
+				RpAtomicRender((RpAtomic*)m_rwObject);
+			else
+				RpClumpRender((RpClump*)m_rwObject);
+			bImBeingRendered = false;
+		}
+	}
+}
+
+#ifdef VIS_DISTANCE_ALPHA
+void
+CEntity::UpdateDistanceFade(void)
+{
+	// bDistanceFade is only valid when entity is in alpha list
+	// but we're always checking it here, see fix in CRenderer
+	int alpha = CVisibilityPlugins::GetObjectDistanceAlpha(m_rwObject);
+	if(CCutsceneMgr::IsRunning() || TheCamera.WorldViewerBeingUsed)
+		alpha = 255;
+	else if(bDistanceFade)
+		alpha = Max(alpha-16, 0);
+	else if(alpha < 255)
+		alpha = Min(alpha+32, 255);
+	CVisibilityPlugins::SetObjectDistanceAlpha(m_rwObject, alpha);
+}
+#endif
+
+void
+CEntity::UpdateAnim(void)
+{
+	if(PauseEntityAnims())
+		return;
+
+	if(m_rwObject && RwObjectGetType(m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(GetClump())) {
+		if (IsObject())
+			RpAnimBlendClumpUpdateAnimations(GetClump(), CTimer::GetTimeStepNonClippedInSeconds());
+		else {
+			if (!bOffscreen)
+				bOffscreen = !GetIsOnScreen();
+			RpAnimBlendClumpUpdateAnimations(GetClump(), CTimer::GetTimeStepInSeconds(), !bOffscreen);
+		}
 	}
 }
 
@@ -434,6 +503,12 @@ CEntity::GetIsTouching(CVUVECTOR const &center, float radius)
 }
 
 bool
+CEntity::GetIsTouching(CEntity *other)
+{
+	return sq(GetBoundRadius()+other->GetBoundRadius()) > (GetBoundCentre()-other->GetBoundCentre()).MagnitudeSqr();
+}
+
+bool
 CEntity::IsVisible(void)
 {
 	return m_rwObject && bIsVisible && GetIsOnScreen();
@@ -634,10 +709,15 @@ CEntity::SetupBigBuilding(void)
 	m_level = CTheZones::GetLevelFromPosition(&GetPosition());
 	if(mi->m_lodDistances[0] <= 2000.0f)
 		bStreamBIGBuilding = true;
-	if(mi->m_lodDistances[0] > 2500.0f || mi->m_ignoreDrawDist)
+	if(m_modelIndex == islandLODindust ||
+	   m_modelIndex == islandLODcomInd ||
+	   m_modelIndex == islandLODcomSub ||
+	   m_modelIndex == islandLODsubInd ||
+	   m_modelIndex == islandLODsubCom ||
+	   mi->m_lodDistances[0] > 5000.0f || mi->m_ignoreDrawDist)
 		m_level = LEVEL_GENERIC;
-	else if(m_level == LEVEL_GENERIC)
-		printf("%s isn't in a level\n", mi->GetModelName());
+//	else if(m_level == LEVEL_GENERIC)
+//		printf("%s isn't in a level\n", mi->GetModelName());
 }
 
 float WindTabel[] = {