Legacy opengl renderer

Avara.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6025AE4E2C255E6A00A57EFB /* LegacyOpenGLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60C274E22C23EBE9005B67A9 /* LegacyOpenGLRenderer.cpp */; };
 		940541ED2B5875B200E32241 /* OpenGLShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 940541EC2B5875B200E32241 /* OpenGLShader.cpp */; };
 		940541EE2B5875B200E32241 /* OpenGLShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 940541EC2B5875B200E32241 /* OpenGLShader.cpp */; };
 		9419E8472B49ECB1007C50D0 /* CTeamColorAdjuster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9419E8462B49ECB1007C50D0 /* CTeamColorAdjuster.cpp */; };
@@ -387,6 +388,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		60C274E22C23EBE9005B67A9 /* LegacyOpenGLRenderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyOpenGLRenderer.cpp; sourceTree = "<group>"; };
+		60C274E32C23EBE9005B67A9 /* LegacyOpenGLRenderer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; path = LegacyOpenGLRenderer.h; sourceTree = "<group>"; };
 		940541EB2B58744500E32241 /* OpenGLShader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGLShader.h; sourceTree = "<group>"; };
 		940541EC2B5875B200E32241 /* OpenGLShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OpenGLShader.cpp; sourceTree = "<group>"; };
 		9419E8452B49EC89007C50D0 /* CTeamColorAdjuster.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CTeamColorAdjuster.h; sourceTree = "<group>"; };
@@ -1083,6 +1086,8 @@
 			children = (
 				947F5C642B576B9F00F41689 /* ModernOpenGLRenderer.cpp */,
 				947F5C632B576ACD00F41689 /* ModernOpenGLRenderer.h */,
+				60C274E22C23EBE9005B67A9 /* LegacyOpenGLRenderer.cpp */,
+				60C274E32C23EBE9005B67A9 /* LegacyOpenGLRenderer.h */,
 				947F5C672B57A30100F41689 /* NullRenderer.h */,
 				940541EC2B5875B200E32241 /* OpenGLShader.cpp */,
 				940541EB2B58744500E32241 /* OpenGLShader.h */,
@@ -2390,6 +2395,7 @@
 				E5890CBF29895118007A875D /* CAbstractActor.cpp in Sources */,
 				E5890CAA29895118007A875D /* CAbstractPipe.cpp in Sources */,
 				E5890F0929895124007A875D /* stb_vorbis.c in Sources */,
+				6025AE4E2C255E6A00A57EFB /* LegacyOpenGLRenderer.cpp in Sources */,
 				E5890D0529895118007A875D /* CSoundMixer.cpp in Sources */,
 				E5890CF529895118007A875D /* CRamp.cpp in Sources */,
 				E5890C9F29895118007A875D /* Resource.cpp in Sources */,
@@ -2597,6 +2603,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2621,6 +2628,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.avaraline.Avara;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 			};
 			name = Debug;
@@ -2661,6 +2669,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.avaraline.Avara;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 			};
 			name = Release;

levels/avaraline-quirks-mode/alf/heir-apparent.alf

@@ -4,11 +4,11 @@
   <set
     pReqPointMultiplier="1"
     pHillX="0"
-    pHillY="4"
+    pHillY="2"
     pHillZ="0"
     pHillW="15"
     pHillD="15"
-    pHillH="2"
+    pHillH="4"
   />
   <include alf="logic/koth.alf" />
 </map>

levels/avaraline-quirks-mode/alf/layout/heir-apparent.alf

@@ -214,10 +214,10 @@
 <Wall color="#ad6a6c" x="0" z="7.5" w="15" d="0" h="2" />
 <Wall color="#ad6a6c" x="-7.5" z="0" w="0" d="15" h="2" />
 <Wall color="#ad6a6c" x="7.5" z="0" w="0" d="15" h="2" />
-<Solid y="2.01" shape="bspGrid7.5" scale="5" color="#3a2c2c" cx="0" cz="4.5" pitch="90" angle="0" />
-<Solid y="2.01" shape="bspEnso" scale="4" color="#3a2c2c" cx="1.75" cz="3.25" angle="-20" />
-<Solid y="2.01" shape="bspGroundStar" scale="0.1" color="#3a2c2c" cx="2.25" cz="3" angle="0" />
-<Solid y="2.01" shape="bspGroundStar" scale="0.1" color="#3a2c2c" cx="1.75" cz="3.5" angle="0" />
+<Hologram y="2.01" shape="bspGrid7.5" scale="5" color="#3a2c2c" cx="0" cz="4.5" pitch="90" angle="0" />
+<Hologram y="2.01" shape="bspEnso" scale="4" color="#3a2c2c" cx="1.75" cz="3.25" angle="-20" />
+<Hologram y="2.01" shape="bspGroundStar" scale="0.1" color="#3a2c2c" cx="2.25" cz="3" angle="0" />
+<Hologram y="2.01" shape="bspGroundStar" scale="0.1" color="#3a2c2c" cx="1.75" cz="3.5" angle="0" />
 
 <Teleporter y="20" shape="0" activeRange="35 * 5" deadRange="28 * 5" destGroup="@recenter" cx="0" cz="0" />
 <Teleporter y="15" shape="0" group="@recenter" cx="0" cz="0" />

src/bsp/CBSPPart.cpp

@@ -14,6 +14,7 @@
 #include "AvaraDefines.h"
 #include "CViewParameters.h"
 #include "Memory.h"
+#include "Debug.h"
 
 #include <fstream>
 #include <iostream>
@@ -38,7 +39,7 @@ CBSPPart *CBSPPart::Create(short resId) {
 
 
 void CBSPPart::IBSPPart(short resId) {
-    //SDL_Log("Loading BSP: %s\n", bspName);
+    DBG_Log("bsp", "Loading BSP: %d\n", resId);
     lightSeed = 0;
     nextTemp = NULL;
     // colorReplacements = NULL;    //  Use default colors.
@@ -101,6 +102,10 @@ void CBSPPart::IBSPPart(short resId) {
     maxBounds.z = ToFixed(mxZ);
     maxBounds.w = FIX1;
 
+    DBG_Log("bsp", "  bounds.x = [%d, %d]\n", minBounds.x, maxBounds.x);
+    DBG_Log("bsp", "  bounds.y = [%d, %d]\n", minBounds.y, maxBounds.y);
+    DBG_Log("bsp", "  bounds.z = [%d, %d]\n", minBounds.z, maxBounds.z);
+
     origColorTable = std::make_unique<ARGBColor[]>(colorCount);
     currColorTable = std::make_unique<ARGBColor[]>(colorCount);
     pointTable = std::make_unique<Vector[]>(pointCount);
@@ -123,12 +128,16 @@ void CBSPPart::IBSPPart(short resId) {
 
     CheckForAlpha();
 
+    // if command is "/dbg bsp 666" then show points for resId 666
+    bool showPoints = (Debug::GetValue("bsp") == resId);
+    if (showPoints) { DBG_Log("bsp", "  points:\n"); }
     for (uint32_t i = 0; i < pointCount; i++) {
         nlohmann::json pt = doc["points"][i];
         pointTable[i][0] = ToFixed(pt[0]);
         pointTable[i][1] = ToFixed(pt[1]);
         pointTable[i][2] = ToFixed(pt[2]);
         pointTable[i][3] = FIX1;
+        if (showPoints) { DBG_Log("bsp", "    %s\n", FormatVector(pointTable[i]).c_str()); }
     }
 
     totalPoints = 0;

src/game/CAbstractPlayer.cpp

@@ -175,6 +175,7 @@ void CAbstractPlayer::StartSystems() {
 
     nextGrenadeLoad = 0;
     nextMissileLoad = 0;
+    nextPlasmaShot = 0;
 
     // variables in AdaptableSettings need to have "classic" counterparts in case they are changed in CWalkerActor::ReceiveConfig()
     classicGeneratorPower = FIX3(30);
@@ -561,7 +562,7 @@ void CAbstractPlayer::LoadDashboardParts() {
     dashboardSpinSpeed = ToFixed(100);
     dashboardSpinHeading = 0;
 
-    int layout = itsGame->itsApp->Get(kHUDPreset);
+    layout = itsGame->itsApp->Get(kHUDPreset);
     //float alpha = itsGame->itsApp->Get(kHUDAlpha);
     //Fixed hudAlpha = FIX1 * alpha;
 
@@ -717,21 +718,22 @@ void CAbstractPlayer::RenderDashboard() {
         // Lastly set relativeImpulse based on the impact location of the hit to bump the HUD
         Fixed hitAngle = FOneArcTan2(dSpeed[2], dSpeed[0]);
         Fixed angleDiff = hitAngle - viewYaw;
+        float magnitude = ToFloat(VectorLength(3, dSpeed));
 
         if (angleDiff > 0) {
             // Hit from the right side
-            relativeImpulse[0] = FIX(1.0);
+            relativeImpulse[0] = FIX(1.0*magnitude);
         } else if (angleDiff < 0) {
             // Hit from the left side
-            relativeImpulse[0] = FIX(-1.0);
+            relativeImpulse[0] = FIX(-1.0*magnitude);
         }
 
         if (dSpeed[1] > FIX(.5)) {
             // Hit from the top
-            relativeImpulse[1] = FIX(1.0);
+            relativeImpulse[1] = FIX(1.0*magnitude);
         } else if (dSpeed[1] < FIX(-.5)) {
             // Hit from the bottom
-            relativeImpulse[1] = FIX(-1.0);
+            relativeImpulse[1] = FIX(-1.0*magnitude);
         }
 
         pidReset(&pMotionX);
@@ -923,11 +925,7 @@ void CAbstractPlayer::DashboardPosition(CScaledBSP *part, bool autoRot, float x,
     // X/Y Coordinates on the screen are roughly described as a percentage of the screen away from the bottom and the left
     // (-1.0, -1.0) is the bottom left of the screen
     // (1.0, 1.0) is the top right of the screen
-
-
-    // TODO: Adjust these until it looks good, then go multiply 
-    // all the DashboardPosition parameters by these numbers, and
-    // then delete these
+
     float scale_x = 11.12;
     float scale_y = 8.23;
     Fixed hud_dist = (FIX3(6000) * 25)/8;
@@ -1144,12 +1142,12 @@ void CAbstractPlayer::ArmSmartMissile() {
     }
 
     if (!didDetach && oldKind != kweSmart && missileCount) {
-        if (nextMissileLoad < itsGame->frameNumber) {
+        if (nextMissileLoad <= itsGame->frameNumber) {
             theWeapon = itsGame->itsDepot->AquireWeapon(kweSmart);
             weaponIdent = theWeapon->Arm(viewPortPart);
             if (weaponIdent) {
                 missileCount--;
-                nextMissileLoad = itsGame->FramesFromNow(3);
+                nextMissileLoad = itsGame->FramesFromNow(4);
             }
         } else
             fireGun = false;
@@ -1177,12 +1175,12 @@ void CAbstractPlayer::ArmGrenade() {
     }
 
     if (!didDetach && oldKind != kweGrenade && grenadeCount) {
-        if (nextGrenadeLoad < itsGame->frameNumber) {
+        if (nextGrenadeLoad <= itsGame->frameNumber) {
             theWeapon = itsGame->itsDepot->AquireWeapon(kweGrenade);
             weaponIdent = theWeapon->Arm(viewPortPart);
             if (weaponIdent) {
                 grenadeCount--;
-                nextGrenadeLoad = itsGame->FramesFromNow(2);
+                nextGrenadeLoad = itsGame->FramesFromNow(3);
             }
         } else
             fireGun = false;
@@ -1294,11 +1292,11 @@ void CAbstractPlayer::KeyboardControl(FunctionTable *ft) {
 
             FPS_DEBUG("   motors after keyb  = " << FormatVector(motors, 2) << std::endl);
 
-            if (TESTFUNC(kfuBoostEnergy, ft->down) && boostsRemaining && (boostEndFrame < itsGame->frameNumber)) {
+            if (TESTFUNC(kfuBoostEnergy, ft->down) && boostsRemaining && (boostEndFrame <= itsGame->frameNumber)) {
                 CBasicSound *theSound;
 
                 boostsRemaining--;
-                boostEndFrame = itsGame->FramesFromNow(BOOSTLENGTH);
+                boostEndFrame = itsGame->FramesFromNow(BOOSTLENGTH+1);
 
                 if (!boostControlLink)
                     boostControlLink = gHub->GetSoundLink();
@@ -1384,10 +1382,12 @@ void CAbstractPlayer::KeyboardControl(FunctionTable *ft) {
             }
         }
 
-        // Disable scout controls while spectating
-        if (winFrame < 0 && !freeView && itsGame->GetSpectatePlayer() == NULL) {
+        // Disable local scout controls while spectating (players in the game still control their scouts)
+        if (winFrame < 0 && !itsManager->IsDeadOrDone()) {
             Boolean doRelease = false;
 
+//            SDL_Log("keys> fn=%d: down=%08x, held=%08x, up=%08x\n",
+//                    itsGame->frameNumber, ft->down, ft->held, ft->up);
             if (TESTFUNC(kfuScoutView, ft->down)) {
                 if (!scoutView && !scoutIdent) {
                     doRelease = true;
@@ -1572,7 +1572,7 @@ void CAbstractPlayer::FrameAction() {
         }
 
         // if a frag frame is specified with /dbg, force a frag on that frame by messing with FRandSeed
-        int fragFrame = Debug::GetValue("frag");
+        int fragFrame = Debug::GetValue("ffrag");
         if (fragFrame > 0 && itsGame->frameNumber == fragFrame) {
             extern Fixed FRandSeed; // to intentionally cause frags below
             FRandSeed += 1;
@@ -1713,7 +1713,8 @@ void CAbstractPlayer::GunActions() {
         if (weapon) {
             weapon->Fire();
             weaponIdent = 0;
-        } else {
+        } else if (nextPlasmaShot <= itsGame->frameNumber) {
+            nextPlasmaShot = itsGame->FramesFromNow(1);
             i = gunEnergy[0] < gunEnergy[1];
             if (gunEnergy[i] >= activeGunEnergy) {
                 Vector missileSpeed;
@@ -1984,7 +1985,7 @@ bool CAbstractPlayer::ReincarnateComplete(CIncarnator* newSpot) {
         LinkPartSpheres();
 
         if (reEnergize) {
-            boostEndFrame = itsGame->FramesFromNow(MINIBOOSTTIME);
+            boostEndFrame = itsGame->FramesFromNow(MINIBOOSTTIME+1);
             reEnergize = false;
             if (shields < maxShields)
                 shields = maxShields;
@@ -2297,10 +2298,10 @@ void CAbstractPlayer::TakeGoody(GoodyRecord *gr) {
     if (energy > maxEnergy)
         energy = maxEnergy;
 
-    if (gr->boostTime > 0 && (boostEndFrame < itsGame->frameNumber)) {
+    if (gr->boostTime > 0 && (boostEndFrame <= itsGame->frameNumber)) {
         CBasicSound *theSound;
 
-        boostEndFrame = itsGame->FramesFromNow(gr->boostTime);
+        boostEndFrame = itsGame->FramesFromNow(gr->boostTime+1);
 
         if (!boostControlLink)
             boostControlLink = gHub->GetSoundLink();

src/game/CAbstractPlayer.h

@@ -83,6 +83,7 @@ class CAbstractPlayer : public CRealMovers {
     short grenadeCount = 0;
     FrameNumber nextGrenadeLoad = 0;
     FrameNumber nextMissileLoad = 0;
+    FrameNumber nextPlasmaShot = 0;
 
     short missileLimit = 0;
     short grenadeLimit = 0;

src/game/CAvaraApp.cpp

@@ -37,6 +37,7 @@
 #include "Tags.h"
 #include "Debug.h"
 #include "ModernOpenGLRenderer.h"
+#include "LegacyOpenGLRenderer.h"
 
 // included while we fake things out
 #include "CPlayerManager.h"
@@ -79,7 +80,13 @@ CAvaraAppImpl::CAvaraAppImpl() : CApplication("Avara") {
         ui->LoadImages(mNVGContext);
     }
 
-    gRenderer = new ModernOpenGLRenderer(mSDLWindow);
+    if (Get(kUseLegacyRenderer)) {
+        gRenderer = new LegacyOpenGLRenderer(mSDLWindow);
+    }
+    else {
+        gRenderer = new ModernOpenGLRenderer(mSDLWindow);
+    }
+
     gRenderer->UpdateViewRect(mSize.x, mSize.y, mPixelRatio);
     gRenderer->SetFOV(Number(kFOV));
     gRenderer->ResetLights();
@@ -152,11 +159,24 @@ void CAvaraAppImpl::Done() {
 }
 
 void CAvaraAppImpl::idle() {
+    static double avg = 0;
+    FrameNumber curFrame = itsGame->frameNumber;
+    uint32_t procTime = SDL_GetTicks();
+
     CheckSockets();
     TrackerUpdate();
     if (itsGame->GameTick()) {
         RenderContents();
     }
+
+    // output a coarse estimate of cpu time & percent every second when enabled
+    if (curFrame > 0 && curFrame != itsGame->frameNumber && Debug::IsEnabled("cpu")) {
+        procTime = SDL_GetTicks() - procTime;
+        avg = 0.99*avg + 0.01*procTime;
+        if (curFrame % (1000/itsGame->frameTime) == 0) {
+            DBG_Log("cpu", "%.1fms (%.0f%%)\n", avg, 100.0*avg/itsGame->frameTime);
+        }
+    }
 }
 
 void CAvaraAppImpl::drawContents() {
@@ -187,7 +207,9 @@ void CAvaraAppImpl::RenderContents() {
 }
 
 void CAvaraAppImpl::WindowResized(int width, int height) {
-    gRenderer->UpdateViewRect(width, height, mPixelRatio);
+    // Only update if the resolution is actually changing
+    if (gRenderer->viewParams->viewPixelDimensions.h != width || gRenderer->viewParams->viewPixelDimensions.v != height)
+        gRenderer->UpdateViewRect(width, height, mPixelRatio);
     //performLayout();
 }
 

src/game/CAvaraGame.cpp

@@ -142,6 +142,7 @@ void CAvaraGame::IAvaraGame(CAvaraApp *theApp) {
     statusRequest = kNoVehicleStatus;
 
     nextPingTime = 0;
+    nextLoadTime = 0;
 
     showNewHUD = gApplication ? gApplication->Get<bool>(kShowNewHUD) : false;
     // CalcGameRect();
@@ -843,6 +844,16 @@ bool CAvaraGame::GameTick() {
         nextPingTime = startTime + pingInterval;
     }
 
+    int randLoadPeriod = Debug::GetValue("rload"); // randomly load a level every `rload` seconds
+    if (randLoadPeriod > 0) {
+        if (startTime > nextLoadTime) {
+            auto p = CPlayerManagerImpl::LocalPlayer();
+            auto *tui = itsApp->GetTui();
+            tui->ExecuteMatchingCommand("/rand", p);
+            nextLoadTime = startTime + 1000*randLoadPeriod;
+        }
+    }
+
     // Not playing? Nothing to do!
     if (statusRequest != kPlayingStatus)
         return false;
@@ -1135,7 +1146,7 @@ void CAvaraGame::IncrementFrame(bool firstFrame) {
     isClassicFrame = (frameNumber % (CLASSICFRAMETIME / frameTime) == 0);
 }
 
-FrameNumber CAvaraGame::FramesFromNow(FrameNumber classicFrameCount) {
+FrameNumber CAvaraGame::FramesFromNow(double classicFrameCount) {
     return frameNumber + classicFrameCount / fpsScale;
 }