aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control
AgeCommit message (Collapse)Author
2018-05-24JANITORIAL: Fix trailing whitespaceAdrian Frühwirth
2018-05-20JANITORIAL: Remove trailing whitespaceAdrian Frühwirth
2017-09-27TITANIC: Fix memory leak in CStarViewPaul Gilbert
2017-09-18TITANIC: Fix memory leak loading star control starsPaul Gilbert
2017-09-10TITANIC: Remove redundant flag clearing in star controlPaul Gilbert
2017-09-09TITANIC: Fix locking/unlocking starfield markers multiple timesPaul Gilbert
2017-09-09TITANIC: Various whitespace fixes in star control classesPaul Gilbert
2017-09-09TITANIC: Prevent locking/unlocking sounds in photoviewDavid Fioramonti
In scummvm and the original engine if you try to unlock/lock stars in photoview/skyview then the stars will not unlock/lock, but the sounds associated with unlocking and locking were playing. Giving a false impression that the locking/unlocking was happening. The sounds no longer play when in photoview.
2017-09-07TITANIC: star camera better handler function namingDavid Fioramonti
The functions that dealt with the mover handling only had handler in the name so I added mover and type to the name to reflect that it involves the mover handler.
2017-09-07TITANIC: star control, removed todos and improved some commentsDavid Fioramonti
2017-09-07TITANIC: make sure of setOrientations more clearDavid Fioramonti
Made camera automover setOrientations not virtual and reduced arguments also changed name since to differentiate it from behavior of derived classes.
2017-09-07TITANIC: Make use of CCameraAutoMover::setPath() more clearDavid Fioramonti
There was a setPath() adn setPath2() function took in different arguments and were doing the same thing, but not using the different arguments. I made it into one function that only takes in the arguments it uses. Also it was marked virtual, but all the derived classes, CMarkedAutoMover, and CUnmarkedAutoMover were just doing there own thing and then calling this base class implementation. Therefore, I made it be not virtual and the derived classes can do there own thing and then call this, but since they are doing slightly different things it makes sense to differentiate the names and not have them all be called setPath. I.e., the derived classes also change the orientation so that is included in their function names to reflect that.
2017-09-07TITANIC: Better naming for Viewport functionDavid Fioramonti
I differentiated getRelativePosCentering() and getRelativePosCentering2() since one was using the raw Pose and one was using the regular Pose.
2017-09-02TITANIC: Minor cleanup and warning fixes to star controlPaul Gilbert
2017-09-02TITANIC: Fix star3 locking overshoot, #9961David Fioramonti
I fixed this previously for star2, I thought the overshoot for star3 locking might have also been fixed since I hadn't observed it in a while. I applied the same workaround by setting the old position to be the new position.
2017-09-02TITANIC: Added/Removed comments for new functions in FVector and FPoseDavid Fioramonti
2017-09-02TITANIC: Move Matrix4Inv out of starcamera and into FPose functionDavid Fioramonti
2017-09-02TITANIC: Remove DVector and DAffine files from build and folderDavid Fioramonti
2017-09-02TITANIC: Swap DAffine for FPose in Orientation and TransformsDavid Fioramonti
More swapping of functions in the Orientation and Transform classes.
2017-09-02TITANIC: Swap DAffine usage for FPose in setViewportAngleDavid Fioramonti
2017-09-02TITANIC: Replace DAffine with FPose in Transform and Orientation classesDavid Fioramonti
2017-09-02TITANIC: Duplicate DAffine usage in lockMarker2 with FPose usageDavid Fioramonti
2017-09-02TITANIC: Templatize matrix_invDavid Fioramonti
This allows DAffine and FPose to use a double version and a float version of matrix4Inv.
2017-09-01TITANIC: Added DAffine functions that combines several vector operationsDavid Fioramonti
2017-09-01TITANIC: Replace all external uses of DVector with FVectorDavid Fioramonti
Wherever DVector was used outside of DAffine and CMatrixTransform I replaced with FVectors. So Internally those functions are still using DVectors. This required adding some new functions to FVector that duplicated functionality in DVector.
2017-08-31TITANIC: Don't allow unlocking stars while locking onto a starDavid Fioramonti
Fixes #10170. I've added a boolean variable that tracks whether the game is in the process of locking onto a star or not. When the user hits the unlock button _isInLockingProcess gets checked and the request to unlock is denied if the locking on is currently happening. Once the locking on is finished then the release is lifted and the user can unlock at this time (or after locking onto the next star).
2017-08-31TITANIC: Minor syntactic fixes for Star Control classesPaul Gilbert
2017-08-31TITANIC: Fix star lock2/lock3 overshoot, fixes #9961David Fioramonti
The problem was that the camera when locking onto the 2nd star was starting at a bad spot and then overshooting when it moved to do the locking movements. A solution I picked is just to start at the final spot. I also removed the check that the distance the mover had to move was too large since the bug is now avoided.
2017-08-31TITANIC: Star Camera lockMarker2 refactorDavid Fioramonti
Named many variables in the lockMarker2 functions.
2017-08-31TITANIC: Add 4x4 inverse to Daffine and use itDavid Fioramonti
Very important for StarCamera:lockMarker2 is an inverse of the difference between locked star1 and about to be star2. Before it was calculating the col4 values by doing a new col4 = -inv(R)*col4. col4 represents the x,y,z position of the vector. This calculation is not correct in the most general sense and is only valid for a single rotation and translation. For any more than one rotation and translation the upper left 3x3 inverse is still the transpose of the previous 3x3 portion there since that is just the rotation part, but the translation part is now R2T1 + T2, which can't be undone by simply multiplying by the inverse of R2. This gets more complicated for lots of rotations so I've added a general 4x4 inverse calculation and just pulled of the column 4 values. The inverse implementation I used was from the mesa 3d library and that has an MIT license so its okay to use in GPL.
2017-08-30TITANIC: Renamed a dvector funcDavid Fioramonti
More correct function naming then before.
2017-08-30TITANIC: StarCamera separate function for calculating angleDavid Fioramonti
This makes lockMarker2 more manageable.
2017-08-30TITANIC: StarCamera workDavid Fioramonti
2017-08-30TITANIC: AutoMover and related refactoringDavid Fioramonti
2017-08-30TITANIC: CCameraMover and related classes RefactorDavid Fioramonti
1. Removed updatePosition function defintions since UnmarkedCameraMover and MarkedCameraMover, derived classes, are overriddening it. I.e., CCameraMover::updatePosition doesn't get used. This also allowed some header files to removed. 2. Renaming of some functions.
2017-08-30TITANIC: Formatting fixes for viewport refactoringPaul Gilbert
2017-08-30Merge pull request #1001 from dafioram/viewport_refactorPaul Gilbert
TITANIC: Viewport refactor
2017-08-27TITANIC: Refactoring of Viewport classDavid Fioramonti
1. Improved naming of functions. E.x., fn17 is now called getRelativePosNoCentering 2. Improved variable names E.x., _valArray[3] is now _pixel1OffSetX, naming makes sense for it use in CBaseStars::draw. 3. Lots of comments and TODO added for suspicious behavior Mentioned unused functions and values that don't get used. 4. Changes in other classes that viewport renaming affected Some of the star_camera functions were 1-1 mapping of functions in viewport so I just made the names be the same.
2017-08-27TITANIC: Fix viewport _field24/starcolor not being savedDavid Fioramonti
One of the fields wasn't getting saved. This field determines whether the star color should be pink or white. It gets recomputed when you put the helmet back on so it doesn't really matter. Previously, when it loaded this value it was loading some orientation data which occurs next in the saved data file for saved games saved by scummvm versions before this commit.
2017-08-27TITANIC: Move Rad2Deg from dvector to fvectorDavid Fioramonti
I wanted to use that variable in viewport.cpp and since fvector.h is included in more functions (already) then dvector it makes sense to move it there.
2017-08-27TITANIC: Add fpose product helper functionDavid Fioramonti
This adds a non-member function that computes the product between two fpose "matrices" and puts it in a third. One of the constructor was doing that so now it calls this non-member function.
2017-08-26TITANIC: Fix another struct vs class warningPaul Gilbert
2017-08-24TITANIC: Reduce header includes for star_control filesDavid Fioramonti
Minimized a lot of the unncessary files includes in the implementation files as well.
2017-08-24TITANIC: Reduce header includes for titanic.hDavid Fioramonti
I reduced the header includes a lot in Titanic.h and forward declared when I could. Titanic.h was including a lot and a lot of functions that were including it were not using its API. This will help make it more clear which implementation files are using which class since they will just need to include which ones they need. I also moved the debug related items in Titanic.h into the debugger header. I also reordered several of the the header includes to be local to global.
2017-08-22TITANIC: Formatting fixes for star control classesPaul Gilbert
2017-08-21TITANIC: Made variable for magic number used in auto camera moverDavid Fioramonti
This variable controls the number of transitions the game goes through when the mover is changing position. This reduces several 31/32s from the code.
2017-08-21TITANIC: Camera Auto Mover class cleanupDavid Fioramonti
Named some functions, made _speeds be an array instead of a dynamic one.
2017-08-21TITANIC: Named some functions in fvectorDavid Fioramonti
2017-08-20TITANIC: Prevent 2 star locking for large distancesDavid Fioramonti
I have added a conditional to the code so that if the player tries to lock onto the 2nd star and they are very far away, >1e8, then the game will not allow the star to be locked. This is a temporary workaround since if a distance of farther then this is attempted then the view will be throw way off and the stars will not be shown locking onto correctly. I've also made the locking functions return booleans so I can determine the success of the lockings. This is a partial fix for #9961.
2017-08-20TITANIC: Change ship view and position even if not movedDavid Fioramonti
The code was preventing the position and view from changing when the distance between the current and new position for a marked auto mover was zero. This happens if you lock the 2nd or 3rd star and then unlock and relock again. It was prevented this with asserts and if statement checks and I removed them all. This section of code isn't doing any inverses based on the reciprocal of the distance so theres no issue with allowing transition speeds/distances of zero. Fixes #10148.