Fog Parameters Updated

Hook timecycle to get fog start value. This is then converted into a density value (based on known range) to produce a nicer fog cutoff value using EXP fog instead of linear table mode.
Merge branch 'skmp/fix-audio-sample-calculations' into 'main'
2025-01-29 15:58:40 -07:00 · 2025-01-26 14:43:07 +00:00 · 2025-01-26 15:36:43 +01:00 · 2025-01-26 13:55:55 +00:00 · 2025-01-26 14:44:29 +01:00 · 2025-01-25 10:50:26 +00:00
15 changed files with 134 additions and 149 deletions
--- a/README.md
+++ b/README.md
@@ -28,12 +28,12 @@ You will also need the following tools installed

 ### Cloning the dca3-game repo and downloading the prebuilt elf
 - Open dreamsdk shell
- type `git clone https://gitlab.com/skmp/dca3-game.git` (and press enter)
+- type `git clone --branch alpha https://gitlab.com/skmp/dca3-game.git` (and press enter)
 - It should take a moment and successfully clone the repo
 - type `cd dca3-game/dreamcast` (and press enter)
 - type `explorer .` (and press enter).
 - A folder named dreamcast with some files should be open. Keep it on the side.
- Download the artifacts from https://gitlab.com/skmp/dca3-game/-/jobs/8725216645
+- Download the Alpha Prebuilt Elf from https://gitlab.com/skmp/dca3-game/-/releases
 - Open artifacts.zip and extract dca3.elf to the folder that was kept open before.
 - Close the folder and dreamsdk shell

--- a/public/index.html
+++ b/public/index.html
@@ -3,100 +3,10 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>DCA3 - A port of RE3 for Dreamcast</title>
-    <!-- Bootstrap CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet">
-    <style>
-        body {
-            background-color: #121212;
-            color: #ffffff;
-        }
-        .navbar {
-            background-color: #1f1f1f;
-        }
-        .hero {
-            text-align: center;
-            padding: 100px 20px;
-            background-color: #333333;
-            border-radius: 10px;
-        }
-        .features {
-            margin-top: 50px;
-        }
-        .footer {
-            text-align: center;
-            padding: 20px;
-            background-color: #1f1f1f;
-            margin-top: 20px;
-            border-radius: 10px;
-        }
-    </style>
+    <title>DCA3 Redirect</title>
+    <meta http-equiv="refresh" content="5;url=https://dca3.net">
 </head>
 <body>
-    <!-- Navbar -->
-    <nav class="navbar navbar-expand-lg navbar-dark">
-        <div class="container">
-            <a class="navbar-brand" href="#">DCA3</a>
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="collapse navbar-collapse" id="navbarNav">
-                <ul class="navbar-nav ms-auto">
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">Home</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#features">Features</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#download">Download</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-
-    <!-- Hero Section -->
-    <div class="container">
-        <div class="hero mt-4">
-            <h1>DCA3</h1>
-            <p>The first-ever port of Grand Theft Auto III to the SEGA Dreamcast, built from the REGTA reverse engineering project.</p>
-            <a href="#download" class="btn btn-primary">Download Now</a>
-        </div>
-    </div>
-
-    <!-- Features Section -->
-    <div class="container features text-center">
-        <h2 id="features" class="mb-4">Key Features</h2>
-        <div class="row">
-            <div class="col-md-4">
-                <h3>Faithful Port</h3>
-                <p>Experience GTA3 as it was meant to be, now on the Dreamcast with okay visuals and sluggish gameplay.</p>
-            </div>
-            <div class="col-md-4">
-                <h3>Open Source</h3>
-                <p>Built on the REGTA reverse engineering project, ensuring accuracy and community-driven development.</p>
-            </div>
-            <div class="col-md-4">
-                <h3>First Release</h3>
-                <p>Celebrating our first release with not very much optimized performance and compatibility for Dreamcast hardware.</p>
-            </div>
-        </div>
-    </div>
-
-    <!-- Download Section -->
-    <div class="container text-center mt-5">
-        <h2 id="download" class="mb-4">Download DCA3</h2>
-        <p>Get started with the first release of  and bring GTA3 to your Dreamcast. You'll need a PC copy of GTA3 to create your .cdi</p>
-        <a href="#" class="btn btn-success btn-lg">Download Version 1.0</a>
-    </div>
-
-    <!-- Footer -->
-    <footer class="footer mt-4">
-        <p>No rights reserved. Made with love for the Dreamcast community.</p>
-    </footer>
-
-    <!-- Bootstrap JS Bundle -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+    <p>You will be redirected to <a href="https://dca3.net">dca3.net</a> in 5 seconds.</p>
 </body>
-</html>
+</html>
--- a/src/animation/AnimBlendNode.cpp
+++ b/src/animation/AnimBlendNode.cpp
@@ -140,7 +140,7 @@ CAnimBlendNode::GetCurrentTranslation(CVector &trans, float weight)
 	float blend = association->GetBlendAmount(weight);
 	if(blend > 0.0f){
 		auto kfAdt = sequence->GetDeltaTime(frameA);
-		float t = (kfAdt - remainingTime)/kfAdt;
+		float t = kfAdt == 0.0f ? 0.0f : (kfAdt - remainingTime)/kfAdt;
 		if(sequence->type & CAnimBlendSequence::KF_TRANS){
 			auto kfAt = sequence->GetTranslation(frameA);
 			auto kfBt = sequence->GetTranslation(frameB);
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -3789,6 +3789,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 						if (iSound > 60)
 							iSound = 21;
 					}
+					// In some cases the left and right channels have different loop points
+					// This looks like a data file issue where the left and right channels have different loop points
+					// This is a hot fix to always have the correct loop point for each channel individually
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -6302,7 +6306,7 @@ cPedComments::Process()
 		{
 		case LOADING_STATUS_NOT_LOADED:
 			SampleManager.LoadPedComment(sampleIndex);
-#ifdef GTA_PS2 // on PC ped comment is loaded at once
+#if defined(GTA_PS2) || defined(RW_DC) // on PC ped comment is loaded at once
 			break;
 #endif
 		case LOADING_STATUS_LOADED:
--- a/src/audio/sampman_dc.cpp
+++ b/src/audio/sampman_dc.cpp
@@ -166,8 +166,12 @@ struct sfx_bank {
 std::map<int, sfx_bank> sfx_banks;

 int nPedSlotSfx[MAX_PEDSFX];
+uint32 nPedSlotSfxReqId[MAX_PEDSFX];
 uintptr_t nPedSlotSfxAddr[MAX_PEDSFX];
 uint8_t nCurrentPedSlot;
+file_t fdPedSfx;
+volatile uint32 nPedSfxReqReadId = 1;
+volatile uint32 nPedSfxReqNextId = 1;

 struct WavHeader {
    // RIFF Header
@@ -442,15 +446,22 @@ cSampleManager::Initialise(void)
 		}
 	});
 	
+	nPedSfxReqNextId = 1;
+	nPedSfxReqReadId = 1;
 	for ( int32 i = 0; i < MAX_PEDSFX; i++ )
 	{
 		nPedSlotSfx[i]     = -1;
+		nPedSlotSfxReqId[i] = 0;
 		nPedSlotSfxAddr[i] = snd_mem_malloc(PED_BLOCKSIZE_ADPCM);
 		debugf("PedSlot %d buffer: %p\n", i, (void*)nPedSlotSfxAddr[i]);
 	}
 	
 	nCurrentPedSlot = 0;

+	fdPedSfx = fs_open(SampleBankDataFilename, O_RDONLY);
+
+	assert(fdPedSfx >= 0);
+
 	_dcAudioInitialized = true;
 	return TRUE;
 }
@@ -458,7 +469,7 @@ cSampleManager::Initialise(void)
 void
 cSampleManager::Terminate(void)
 {
-
+	fs_close(fdPedSfx);
 }

 bool8 cSampleManager::CheckForAnAudioFileOnCD(void)
@@ -637,7 +648,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 			slot += ARRAY_SIZE(nPedSlotSfx);
 #endif
 		if ( nComment == nPedSlotSfx[slot] )
-			return LOADING_STATUS_LOADED;
+			return nPedSlotSfxReqId[slot] <= nPedSfxReqReadId ? LOADING_STATUS_LOADED : LOADING_STATUS_LOADING;
 	}
 	
 	return LOADING_STATUS_NOT_LOADED;
@@ -698,27 +709,28 @@ cSampleManager::LoadPedComment(uint32 nComment)

 	assert(m_aSamples[nComment].nByteSize < PED_BLOCKSIZE_ADPCM);

-	file_t fd = fs_open(SampleBankDataFilename, O_RDONLY);
-
-	assert(fd >= 0);
-	debugf("Loading ped comment %d, offset: %d, size: %d\n", nComment, m_aSamples[nComment].nFileOffset, m_aSamples[nComment].nByteSize);
-	fs_seek(fd, m_aSamples[nComment].nFileOffset, SEEK_SET);
+	CdStreamQueueAudioRead(nComment, (void*)nPedSlotSfxAddr[nCurrentPedSlot], m_aSamples[nComment].nByteSize, m_aSamples[nComment].nFileOffset, [](AudioReadCmd* cmd) {
+		debugf("Loading ped comment %d, offset: %d, size: %d\n", nComment, m_aSamples[nComment].nFileOffset, m_aSamples[nComment].nByteSize);
+		fs_seek(fdPedSfx, cmd->seek, SEEK_SET);


-	// TODO: When we can dma directly to AICA, we can use this instead
-	// fs_read(fd, SPU_BASE_U8 + nPedSlotSfxAddr[nCurrentPedSlot], sizeof(nPedSlotSfxAddr));
+		// TODO: When we can dma directly to AICA, we can use this instead
+		// fs_read(fdPedSfx, SPU_BASE_U8 + (uintptr_t)cmd->dest, cmd->size);

-	void* stagingBuffer = memalign(32, m_aSamples[nComment].nByteSize);
-	assert(stagingBuffer != 0);
-	debugf("Allocated %d bytes at %p\n", m_aSamples[nComment].nByteSize, stagingBuffer);
-	int rs = fs_read(fd, stagingBuffer, m_aSamples[nComment].nByteSize);
-	debugf("Read %d bytes, expected %d\n", rs, m_aSamples[nComment].nByteSize);
-	assert(rs == m_aSamples[nComment].nByteSize);
+		void* stagingBuffer = memalign(32, cmd->size);
+		assert(stagingBuffer != 0);
+		debugf("Allocated %d bytes at %p\n", cmd->size, stagingBuffer);
+		int rs = fs_read(fdPedSfx, stagingBuffer, cmd->size);
+		debugf("Read %d bytes, expected %d\n", rs, cmd->size);
+		assert(rs == cmd->size);

-	fs_close(fd);
+		spu_memload((uintptr_t)cmd->dest, stagingBuffer, cmd->size);
+		free(stagingBuffer);
+		nPedSfxReqReadId = nPedSfxReqReadId + 1;
+	});

-	spu_memload(nPedSlotSfxAddr[nCurrentPedSlot], stagingBuffer, m_aSamples[nComment].nByteSize);
-	free(stagingBuffer);
+	nPedSlotSfxReqId[nCurrentPedSlot] = ++nPedSfxReqNextId;
+	
 	nPedSlotSfx[nCurrentPedSlot] = nComment;

 	if ( ++nCurrentPedSlot >= MAX_PEDSFX )
@@ -1120,7 +1132,8 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
 	debugf("StartStreamedFile(%d, %d, %d)\n", nFile, nPos, nStream);
 	uint32_t seek_aligned = 0;
 	if (nPos) {
-		uint32 seek_bytes = nPos * streams[nStream].rate / (streams[nStream].stereo ? 1000: 2000);
+		uint64_t seek_bytes = (uint64_t)nPos * streams[nStream].rate / (streams[nStream].stereo ? 1000: 2000);
+		assert(seek_bytes <= INT32_MAX);
 		seek_aligned = seek_bytes & ~(streams[nStream].stereo ? (STREAM_STAGING_READ_SIZE_STEREO-1) : (STREAM_STAGING_READ_SIZE_MONO-1));
 	}
 	PreloadStreamedFile(nFile, nStream, seek_aligned);
@@ -1152,7 +1165,9 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 	ASSERT( nStream < MAX_STREAMS );
 	int32 rv = 0;

-	return streams[nStream].played_samples * 1000 / streams[nStream].rate;
+	int64_t rv64 = (int64_t)streams[nStream].played_samples * 1000 / streams[nStream].rate;
+	assert(rv64 <= INT32_MAX);
+	rv = (int32)rv64;
 	// if(streams[nStream].fd >= 0) {
 	// 	rv = fs_tell(streams[nStream].fd);
 	// }
@@ -1195,7 +1210,10 @@ cSampleManager::GetStreamedFileLength(uint8 nFile)
 	WavHeader hdr;
 	assert(fs_read(fd, &hdr, sizeof(hdr)) == sizeof(hdr));

-	rv = hdr.dataSize * 2000 / hdr.numOfChan / hdr.samplesPerSec;
+	uint64_t rv64 = (uint64_t)hdr.dataSize * 2000 / hdr.numOfChan / hdr.samplesPerSec;
+
+	assert(rv64 <= INT32_MAX);
+	rv = (int32)rv64;

 	fs_close(fd);

--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1721,8 +1721,8 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 			return 0;
 		int attempts;
 		int model = -1;
-		int index = CGeneral::GetRandomNumberInRange(0, 50);
-		for (attempts = 0; attempts < 50; attempts++) {
+		int index = CGeneral::GetRandomNumberInRange(0, MAXVEHICLESLOADED);
+		for (attempts = 0; attempts < MAXVEHICLESLOADED; attempts++) {
 			if (model != -1)
 				break;
 			model = CStreaming::ms_vehiclesLoaded[index];
--- a/src/core/CdStream.h
+++ b/src/core/CdStream.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <functional>

 #define CDSTREAM_SECTOR_SIZE 2048

@@ -43,7 +44,14 @@ char *CdStreamGetImageName(int32 cd);
 void CdStreamRemoveImages(void);
 int32 CdStreamGetNumImages(void);

-void CdStreamQueueAudioRead(int fd, void* pBuffer, size_t bytes, size_t seek);
+struct AudioReadCmd {
+	void* dest;
+	int fd;
+	size_t size;
+	size_t seek;
+	std::function<void(AudioReadCmd*)> callback;
+};
+void CdStreamQueueAudioRead(int fd, void* pBuffer, size_t bytes, size_t seek, std::function<void(AudioReadCmd*)> callback = nullptr);
 void CdStreamDiscardAudioRead(int fd);

 #ifdef FLUSHABLE_STREAMING
--- a/src/core/CdStreamDC.cpp
+++ b/src/core/CdStreamDC.cpp
@@ -26,12 +26,6 @@
 #include "CdStream.h"
 #include "rwcore.h"
 #include "MemoryMgr.h"
-struct AudioReadCmd {
-	void* dest;
-	int fd;
-	size_t size;
-	size_t seek;
-};

 #define CDDEBUG(f, ...)   debug ("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
 #define CDTRACE(f, ...)   printf("%s: " f "\n", "cdvd_stream", ## __VA_ARGS__)
@@ -489,8 +483,16 @@ std::vector<AudioReadCmd> pendingAudioReads;
 std::mutex pendingAudioReadsMutex;
 #endif
 // Will replace a previous read request for the same file descriptor
-void CdStreamQueueAudioRead(int fd, void* pBuffer, size_t bytes, size_t seek) {
+void CdStreamQueueAudioRead(int fd, void* pBuffer, size_t bytes, size_t seek, std::function<void(AudioReadCmd*)> callback) {
 	AudioReadCmd cmd = { pBuffer, fd, bytes, seek};
+	if (!callback) {
+		cmd.callback = [](AudioReadCmd* cmd){
+			lseek(cmd->fd, cmd->seek, SEEK_SET);
+			read(cmd->fd, cmd->dest, cmd->size);
+		};
+	} else {
+		cmd.callback = callback;
+	}
 	{
 		#if !defined(DC_SH4)
 		std::lock_guard<std::mutex> lock(pendingAudioReadsMutex);
@@ -514,6 +516,7 @@ void CdStreamQueueAudioRead(int fd, void* pBuffer, size_t bytes, size_t seek) {
 	sem_post(gCdStreamSema);
 }

+
 void CdStreamDiscardAudioRead(int fd) {
 	#if !defined(DC_SH4)
 	std::lock_guard<std::mutex> lock(pendingAudioReadsMutex);
@@ -564,8 +567,7 @@ int read_loop(int fd, void* pBuffer, size_t bytes) {
 		total_read += read_bytes;
 		auto cmd = CdStreamNextAudioRead();
 		while (cmd.fd != -1) {
-			lseek(cmd.fd, cmd.seek, SEEK_SET);
-			read(cmd.fd, cmd.dest, cmd.size);
+			cmd.callback(&cmd);
 			cmd = CdStreamNextAudioRead();
 		}
 	}
@@ -581,8 +583,7 @@ void *CdStreamThread(void *param)

 		auto cmd = CdStreamNextAudioRead();
 		while (cmd.fd != -1) {
-			lseek(cmd.fd, cmd.seek, SEEK_SET);
-			read(cmd.fd, cmd.dest, cmd.size);
+			cmd.callback(&cmd);
 			cmd = CdStreamNextAudioRead();
 		}

--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -2785,22 +2785,22 @@ bool CPad::WeaponJustDown(void)
 		case 0:	//Xbox Mode
 			if (CPad::GetPad(0)->IsDualAnalog)
 			{
-				if (NewState.RightTrigger > 128)
+				if (NewState.RightTrigger > 128 && !(OldState.RightTrigger > 128))
 					return true;			
 			}
 			else
 			{
-				if (NewState.RightTrigger > 128)
+				if (NewState.RightTrigger > 128 && !(OldState.RightTrigger > 128))
 					return true;			
 			}
 		case 1:	//PS2 Mode
 			if (CPad::GetPad(0)->IsDualAnalog)
 			{
-				return	NewState.B;
+				return	NewState.B && !OldState.B;
 			}
 			else
 			{
-				return	NewState.B;
+				return	NewState.B && !OldState.B;
 			}
 	}

--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -83,6 +83,11 @@ CEntity::~CEntity(void)
 	ResolveReferences();
 }

+bool
+CEntity::IsFence(void) {
+	return IsObject() && ::IsFence(static_cast<CObject *>(this)->GetModelIndex());
+}
+
 void
 CEntity::SetModelIndex(uint32 id)
 {
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -131,6 +131,7 @@ public:
 	bool IsPed(void) { return m_type == ENTITY_TYPE_PED; }
 	bool IsObject(void) { return m_type == ENTITY_TYPE_OBJECT; }
 	bool IsDummy(void) { return m_type == ENTITY_TYPE_DUMMY; }
+	bool IsFence(void);

 	RpAtomic *GetAtomic(void) {
 		assert(RwObjectGetType(m_rwObject) == rpATOMIC);
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -59,7 +59,7 @@ CPhysical::CPhysical(void)
 	bInfiniteMass = false;
 	bIsInWater = false;
 	bHitByTrain = false;
-	bSkipLineCol = false;
+	bSkipLineCol = IsFence();

 	m_fDistanceTravelled = 0.0f;
 	m_treadable[PATH_CAR] = nil;
@@ -1461,6 +1461,10 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 			skipCollision = false;
 			altcollision = false;

+			if(A->IsFence() && B->IsFence()) {
+				skipCollision = true;
+				A->bSkipLineCol = true;
+			}
 			if(B->IsBuilding())
 				skipCollision = false;
 			else if(IsStreetLight(A->GetModelIndex()) &&
@@ -1922,12 +1926,12 @@ CPhysical::ProcessCollision(void)
 				n = NUMSTEPS(0.09f);
 				step = savedTimeStep / n;
 			}
-		}else if(responsecase == COLLRESPONSE_SMALLBOX || responsecase == COLLRESPONSE_FENCEPART){
+		}else if(responsecase == COLLRESPONSE_SMALLBOX){
 			if(distSq >= sq(0.15f)){
 				n = NUMSTEPS(0.15f);
 				step = savedTimeStep / n;
 			}
-		}else{
+		}else if(responsecase != COLLRESPONSE_FENCEPART){
 			if(distSq >= sq(0.3f)){
 				n = NUMSTEPS(0.3f);
 				step = savedTimeStep / n;
--- a/src/math/Matrix.cpp
+++ b/src/math/Matrix.cpp
@@ -282,7 +282,7 @@ CMatrix::SetRotate(float xAngle, float yAngle, float zAngle)
 void
 CMatrix::RotateX(float x)
 {
-#ifdef DC_SH4
+#if 0 && defined(DC_SH4) // this is bugged and does not yield correct results
 	mat_load(reinterpret_cast<matrix_t *>(this));
 	mat_rotate_x(x);
 	mat_store(reinterpret_cast<matrix_t *>(this));
@@ -312,7 +312,7 @@ CMatrix::RotateX(float x)
 void
 CMatrix::RotateY(float y)
 {
-#ifdef DC_SH4
+#if 0 && defined(DC_SH4) // this is bugged and does not yield correct results
 	mat_load(reinterpret_cast<matrix_t *>(this));
 	mat_rotate_y(y);
 	mat_store(reinterpret_cast<matrix_t *>(this));
@@ -342,7 +342,7 @@ CMatrix::RotateY(float y)
 void
 CMatrix::RotateZ(float z)
 {
-#ifdef DC_SH4
+#if 0 && defined(DC_SH4) // this is bugged and does not yield correct results
 	mat_load(reinterpret_cast<matrix_t *>(this));
 	mat_rotate_z(z);
 	mat_store(reinterpret_cast<matrix_t *>(this));
@@ -372,7 +372,7 @@ CMatrix::RotateZ(float z)
 void
 CMatrix::Rotate(float x, float y, float z)
 {
-#ifdef DC_SH4
+#if 0 && defined(DC_SH4) // this is bugged and does not yield correct results
 	mat_load(reinterpret_cast<matrix_t *>(this));
 	mat_rotate(x, y, z);
 	mat_store(reinterpret_cast<matrix_t *>(this));
@@ -404,6 +404,20 @@ CMatrix::Rotate(float x, float y, float z)
 	float z2 = sZ * sY - (cZ * sX) * cY;
 	float z3 = cX * cY;

+	#if !defined(DC_TEXCONV) && !defined(DC_SIM)
+	this->rx = fipr(x1, y1, z1, 0,  rx, ry, rz, 0);
+	this->ry = fipr(x2, y2, z2, 0,  rx, ry, rz, 0);
+	this->rz = fipr(x3, y3, z3, 0,  rx, ry, rz, 0);
+	this->fx = fipr(x1, y1, z1, 0,  ux, uy, uz, 0);
+	this->fy = fipr(x2, y2, z2, 0,  ux, uy, uz, 0);
+	this->fz = fipr(x3, y3, z3, 0,  ux, uy, uz, 0);
+	this->ux = fipr(x1, y1, z1, 0,  ax, ay, az, 0);
+	this->uy = fipr(x2, y2, z2, 0,  ax, ay, az, 0);
+	this->uz = fipr(x3, y3, z3, 0,  ax, ay, az, 0);
+	this->px = fipr(x1, y1, z1, 0,  px, py, pz, 0);
+	this->py = fipr(x2, y2, z2, 0,  px, py, pz, 0);
+	this->pz = fipr(x3, y3, z3, 0,  px, py, pz, 0);
+	#else
 	this->rx = x1 * rx + y1 * ry + z1 * rz;
 	this->ry = x2 * rx + y2 * ry + z2 * rz;
 	this->rz = x3 * rx + y3 * ry + z3 * rz;
@@ -416,6 +430,7 @@ CMatrix::Rotate(float x, float y, float z)
 	this->px = x1 * px + y1 * py + z1 * pz;
 	this->py = x2 * px + y2 * py + z2 * pz;
 	this->pz = x3 * px + y3 * py + z3 * pz;
+	#endif
 #endif
 }

--- a/src/renderer/WaterLevel.cpp
+++ b/src/renderer/WaterLevel.cpp
@@ -1479,7 +1479,8 @@ CWaterLevel::AllocateBoatWakeArray()
 			apGeomArray[geom] = RpGeometryCreate(9*9, 8*8*2, rpGEOMETRYTRISTRIP
 															| rpGEOMETRYPRELIT
 															| rpGEOMETRYMODULATEMATERIALCOLOR
-															| rpGEOMETRYTEXTURED);
+															| rpGEOMETRYTEXTURED
+															| rw::Geometry::HAS_TRIANGLES/* RW_DC specific */);
 			ASSERT(apGeomArray[geom] != nil);

 			RpTriangle *geomTriangles = RpGeometryGetTriangles(apGeomArray[geom]);
--- a/vendor/librw/src/dc/rwdc.cpp
+++ b/vendor/librw/src/dc/rwdc.cpp
@@ -174,6 +174,7 @@ static pvr_dr_state_t drState;
 #include <kos/dbglog.h>

 #if !defined(DC_TEXCONV) && !defined(DC_SIM)
+#include "Timecycle.h"
 #include <kos.h>

 #define VIDEO_MODE_WIDTH  vid_mode->width
@@ -305,6 +306,7 @@ void rw_mat_load_4x4(rw::Matrix* mtx) {
 #define mat_identity(a)
 #define pvr_fog_table_color(a,r,g,b)
 #define pvr_fog_table_linear(s,e)
+#define pvr_fog_table_exp(d)
 #endif

 #define mat_trans_single3_nomod(x_, y_, z_, x2, y2, z2) do { \
@@ -1098,6 +1100,7 @@ static bool doAlphaTest;

 static uint8_t fogFuncPvr = PVR_FOG_DISABLE;
 static uint32_t fogColor = 0;
+static float fogStart = 0.0f;
 static uint32 cullModePvr;

 static inline unsigned pvrCullMode(uint32_t cullMode) {
@@ -1198,8 +1201,9 @@ setRenderState(int32 state, void *pvalue)
 	 	fogFuncPvr = value ? PVR_FOG_TABLE : PVR_FOG_DISABLE;
 	 	break;
 	 case FOGCOLOR:
+#if !defined(DC_TEXCONV)		
        // Set fog color when state changes
-        if(fogColor != value) {
+        if(fogColor != value || fogStart != CTimeCycle::GetFogStart()) {
            fogColor = value;
            RGBA c;
            c.red = value;
@@ -1207,9 +1211,21 @@ setRenderState(int32 state, void *pvalue)
            c.blue = value>>16;
            c.alpha = value>>24;
            pvr_fog_table_color(c.alpha / 255.0f, c.red / 255.0f, c.green  / 255.0f, c.blue  / 255.0f);
-            pvr_fog_table_linear(50.0f, 450.0f);
+
+			fogStart = CTimeCycle::GetFogStart();
+            //pvr_fog_table_linear(fogStart + 200.0f, fogStart + 450.0f);
+
+			// Fog ranges between -200 (Most Fog) and +100 (least fog) (these are loaded from TIMECYC.DAT)
+			// This formula will transform these values into a density between 0 and 0.02f
+			const float MAX_DENSITY = 0.02f;
+			const float FOG_RANGE = 300.0f;
+			const float FOG_OFFSET = 200.0f;
+			float density = ((FOG_RANGE - (fogStart + FOG_OFFSET)) / FOG_RANGE) * MAX_DENSITY;
+			pvr_fog_table_exp(density);
        }
+#endif
 	 	break;
+
 	// case CULLMODE:
 	// 	if(rwStateCache.cullmode != value){
 	// 		rwStateCache.cullmode = value;
@@ -3294,6 +3310,8 @@ void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) {

 	for (int16_t n = 0; n < numMeshes; n++) {
 		bool doBlend = meshes[n].material->color.alpha != 255; // TODO: check all vertexes for alpha?
+		bool doBlendMaterial = doBlend;
+
 		bool textured = geo->numTexCoordSets && meshes[n].material->texture;
 		if (textured) {
 			doBlend |= Raster::formatHasAlpha(meshes[n].material->texture->raster->format);
@@ -3343,7 +3361,7 @@ void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) {
 		pvr_poly_cxt_t cxt;
 		int pvrList;
 		if (doBlend || isMatFX) {
-			if (doAlphaTest) {
+			if (doAlphaTest && !doBlendMaterial) {
 				pvrList = PVR_LIST_PT_POLY;
 			} else {
 				pvrList = PVR_LIST_TR_POLY;
@@ -3709,7 +3727,7 @@ void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) {
 		};

 		if (doBlend || isMatFX) {
-			if (doAlphaTest) {
+			if (doAlphaTest && !doBlendMaterial) {
 				ptCallbacks.emplace_back(std::move(renderCB));
 			} else {
 				blendCallbacks.emplace_back(std::move(renderCB));
Author	SHA1	Message	Date
Josh Pearson	282b639a4c	Fog Parameters Updated Hook timecycle to get fog start value. This is then converted into a density value (based on known range) to produce a nicer fog cutoff value using EXP fog instead of linear table mode.	2025-01-29 15:58:40 -07:00
Stefanos Kornilios Mitsis Poiitidis	69f9bbcf7b	Merge branch 'skmp/fix-audio-sample-calculations' into 'main' audio: Do sample <-> milisecond in 64 bit precision, as intermediate steps might overflow int32 See merge request skmp/dca3-game!19	2025-01-26 14:43:07 +00:00
Stefanos Kornilios Mitsis Poiitidis	40f212e131	audio: Do sample <-> milisecond in 64 bit precision, as intermediate steps might overflow int32	2025-01-26 15:36:43 +01:00
Stefanos Kornilios Mitsis Poiitidis	43c0e99ebf	Merge branch 'skmp/fix-dam-flamethrower' into 'main' Fix Dynamic Acoustic Modelling: off & Flamethrower SFX See merge request skmp/dca3-game!18	2025-01-26 13:55:55 +00:00
Stefanos Kornilios Mitsis Poiitidis	42647ddc6b	Fix Dynamic Acoustic Modelling: off & Flamethrower SFX	2025-01-26 14:44:29 +01:00
Stefanos Kornilios Mitsis Poiitidis	b3ccf1f900	Merge branch 'ph3nom/fix-throwing-controls' into 'main' Fix Throwing Grenade and Moltov Coctail Controls See merge request skmp/dca3-game!17	2025-01-25 10:50:26 +00:00
Josh Pearson	baf7612fcf	Fix Throwing Grenade and Moltov Coctail Controls	2025-01-24 17:08:55 -07:00
Stefanos Kornilios Mitsis Poiitidis	33b9dd1c8a	Merge branch 'skmp/protect-from-zero-delta-times' into 'main' CAnimBlendNode::GetCurrentTranslation: Protect against zero delta times See merge request skmp/dca3-game!15	2025-01-16 06:13:03 +00:00
Stefanos Kornilios Mitsis Poiitidis	5786eeecb8	Merge branch 'falco/fuck_da_fences' into 'main' Fixed the goddamn fences. See merge request skmp/dca3-game!14	2025-01-16 06:11:54 +00:00
Stefanos Kornilios Mitsis Poiitidis	20864fdac6	Merge branch '49-game-crash-when-entering-parking-garage-on-staunton-island' into 'main' Resolve "Parking garage crash fix" See merge request skmp/dca3-game!16	2025-01-16 06:09:08 +00:00
mark wallace	1587d707a8	Parking garage bug fix.	2025-01-16 04:11:34 +00:00
Stefanos Kornilios Mitsis Poiitidis	911b93bd0f	CAnimBlendNode::GetCurrentTranslation: Protect against zero delta times	2025-01-14 23:18:24 +02:00
Falco Girgis	e86fb27a48	Fixed the goddamn fences. Colliding with and/or brushing against the metal chain-linked fences in the game caused severe performance degredation as the SH4 struggled to keep up with the physics. The PSVita REGTA3 port also struggled, somehow, with its bazillion times faster CPU. The PS2 version has no fences. The Xbox version implemented an interesting compromise, where fences could be collided with and knocked over, but individual links did not interact with one-another, only with the car. So that's what I've essentially done here. Intersection testing is still happening between all of the previous CPhysical entities in question (player vs fences vs fences); however, the contact resolution for fence vs fence collisions is now being essentially canceled. Apparently that's all that was needed, as you can now mow down long-ass fences with no performance impact and a response that looks like what the Xbox does.	2025-01-12 00:29:42 -06:00
Stefanos Kornilios Mitsis Poiitidis	2065c9a93f	Merge branch 'skmp/fix-AllocateBoatWakeArray' into 'main' Some checks failed re3 conan+cmake / build-cmake (openal, glfw, macos-latest, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, glfw, ubuntu-18.04, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, glfw, windows-latest, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, windows-latest, d3d9) (push) Has been cancelled Details re3 cmake devkitA64 (Nintendo Switch) / build-nintendo-switch (push) Has been cancelled Details re3 premake amd64 / build (Debug, win-amd64-librw_d3d9-oal) (push) Has been cancelled Details re3 premake amd64 / build (Debug, win-amd64-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake amd64 / build (Release, win-amd64-librw_d3d9-oal) (push) Has been cancelled Details re3 premake amd64 / build (Release, win-amd64-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details Fix AllocateBoatWakeArray, it needs RpGeometryCreate with HAS_TRIANGLES See merge request skmp/dca3-game!12	2025-01-06 11:46:50 +00:00
Stefanos Kornilios Mitsis Poiitidis	a2caa56275	Merge branch 'skmp/material-alpha-override-pt' into 'main' Perform full blending for mat.a != 0xFF, should fade-in sprites (eg, Trees) See merge request skmp/dca3-game!11	2025-01-06 11:41:11 +00:00
Stefanos Kornilios Mitsis Poiitidis	fa65f637ad	Fix AllocateBoatWakeArray, it needs RpGeometryCreate with HAS_TRIANGLES	2025-01-06 13:40:31 +02:00
Stefanos Kornilios Mitsis Poiitidis	0a0a664428	Perform full blending for mat.a != 0xFF, should fade-in sprites (eg, Trees)	2025-01-05 15:40:18 +02:00
Stefanos Kornilios Mitsis Poiitidis	5abd0641a4	Merge branch 'skmp/fix-staring-into-the-void' into 'main' Some checks are pending re3 conan+cmake / build-cmake (openal, glfw, macos-latest, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, glfw, ubuntu-18.04, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, glfw, windows-latest, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, windows-latest, d3d9) (push) Waiting to run Details re3 cmake devkitA64 (Nintendo Switch) / build-nintendo-switch (push) Waiting to run Details re3 premake amd64 / build (Debug, win-amd64-librw_d3d9-oal) (push) Waiting to run Details re3 premake amd64 / build (Debug, win-amd64-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake amd64 / build (Release, win-amd64-librw_d3d9-oal) (push) Waiting to run Details re3 premake amd64 / build (Release, win-amd64-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details Revert buggy optimizations in CMatrix::Rotate*. Didn't investigate much, they aren't often called Closes #8 and #6 See merge request skmp/dca3-game!9	2025-01-05 08:21:54 +00:00
Stefanos Kornilios Mitsis Poiitidis	ca866bdb2a	Fix sim build	2025-01-05 10:15:30 +02:00
Stefanos Kornilios Mitsis Poiitidis	bf0e36858e	Use fipr in CMatrix::Rotate, simplifies it so it doesn't ICE Some checks failed re3 conan+cmake / build-cmake (openal, glfw, macos-latest, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, glfw, ubuntu-18.04, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, glfw, windows-latest, gl3) (push) Has been cancelled Details re3 conan+cmake / build-cmake (openal, windows-latest, d3d9) (push) Has been cancelled Details re3 cmake devkitA64 (Nintendo Switch) / build-nintendo-switch (push) Has been cancelled Details re3 premake amd64 / build (Debug, win-amd64-librw_d3d9-oal) (push) Has been cancelled Details re3 premake amd64 / build (Debug, win-amd64-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake amd64 / build (Release, win-amd64-librw_d3d9-oal) (push) Has been cancelled Details re3 premake amd64 / build (Release, win-amd64-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-mss) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-oal) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-mss) (push) Has been cancelled Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-oal) (push) Has been cancelled Details	2025-01-05 09:19:02 +02:00
Stefanos Kornilios Mitsis Poiitidis	b90e8433da	Revert buggy optimizations in CMatrix::Rotate*. Didn't investigate much, they aren't often called	2025-01-05 09:12:56 +02:00
Stefanos Kornilios Mitsis Poiitidis	133110c15c	Merge branch 'skmp/async-pedsfx-load' into 'main' Some checks are pending re3 conan+cmake / build-cmake (openal, glfw, macos-latest, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, glfw, ubuntu-18.04, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, glfw, windows-latest, gl3) (push) Waiting to run Details re3 conan+cmake / build-cmake (openal, windows-latest, d3d9) (push) Waiting to run Details re3 cmake devkitA64 (Nintendo Switch) / build-nintendo-switch (push) Waiting to run Details re3 premake amd64 / build (Debug, win-amd64-librw_d3d9-oal) (push) Waiting to run Details re3 premake amd64 / build (Debug, win-amd64-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake amd64 / build (Release, win-amd64-librw_d3d9-oal) (push) Waiting to run Details re3 premake amd64 / build (Release, win-amd64-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Debug, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Release, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-mss) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_d3d9-oal) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-mss) (push) Waiting to run Details re3 premake x86 / build (Vanilla, win-x86-librw_gl3_glfw-oal) (push) Waiting to run Details PedSfx: Read from I/O thread, load them on the background See merge request skmp/dca3-game!10	2025-01-04 19:15:39 +00:00
Stefanos Kornilios Mitsis Poiitidis	6f71cfc458	PedSfx: Read from I/O thread, load them on the background	2025-01-04 17:46:48 +02:00
Stefanos Kornilios Mitsis Poiitidis	02d0103b20	Redirect to dca3.net	2024-12-31 09:05:08 +00:00
Stefanos Kornilios Mitsis Poiitidis	72da27ef0b	Edit README.md	2024-12-29 22:23:08 +00:00