libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-11 12:18:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Modify the RenderTable panorama math to account for panoramas being transposed

Browse Source
This commit is contained in:
richiesams 2013-07-26 12:26:30 -05:00
parent 2349fcfd31
commit 3d223e2123
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engines/zvision/render_table.cpp
View File

@ -29,7 +29,8 @@ namespace ZVision {
RenderTable::RenderTable(uint32 numRows, uint32 numColumns) RenderTable::RenderTable(uint32 numRows, uint32 numColumns)
: _numRows(numRows), : _numRows(numRows),
_numColumns(numColumns) { _numColumns(numColumns),
_renderState(RenderState::FLAT) {
assert(numRows != 0 && numColumns != 0); assert(numRows != 0 && numColumns != 0);
_internalBuffer = new Common::Point[numRows * numColumns]; _internalBuffer = new Common::Point[numRows * numColumns];
@ -57,6 +58,21 @@ void RenderTable::setRenderState(RenderState newState) {
} }
} }
void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 horizontalPitch, Common::Rect subRectangle) {
uint32 imageWidth = horizontalPitch / 2;
for (int y = subRectangle.top; y < subRectangle.bottom; y++) {
uint32 normalizedY = y - subRectangle.top;
for (int x = subRectangle.left; x < subRectangle.right; x++) {
uint32 normalizedX = x - subRectangle.left;
uint32 index = y * _numColumns + x;
uint32 sourceIndex = _internalBuffer[index].y * imageWidth + _internalBuffer[index].x;
destBuffer[normalizedY * subRectangle.width() + normalizedX] = sourceBuffer[sourceIndex];
}
}
}
void RenderTable::generatePanoramaLookupTable() { void RenderTable::generatePanoramaLookupTable() {
float fieldOfView = _panoramaOptions.fieldOfView; float fieldOfView = _panoramaOptions.fieldOfView;
float scale = _panoramaOptions.linearScale; float scale = _panoramaOptions.linearScale;
@ -70,20 +86,23 @@ void RenderTable::generatePanoramaLookupTable() {
float halfHeightOverTan = halfHeight / tan(fovRadians); float halfHeightOverTan = halfHeight / tan(fovRadians);
float tanOverHalfHeight = tan(fovRadians) / halfHeight; float tanOverHalfHeight = tan(fovRadians) / halfHeight;
for (uint32 x = 0; x < _numRows; x++) { // TODO: Change the algorithm to write a whole row at a time instead of a whole column at a time. AKA: for(y) { for(x) {}} instead of for(x) { for(y) {}}
for (uint32 x = 0; x < _numColumns; x++) {
// Add an offset of 0.01 to overcome zero tan/atan issue (vertical line on half of screen) // Add an offset of 0.01 to overcome zero tan/atan issue (vertical line on half of screen)
float xPos = (float)x - halfWidth + 0.01; float temp = atan(tanOverHalfHeight * ((float)x - halfWidth + 0.01f));
float tempX = atan(xPos*tanOverHalfHeight);
int32 newX = floor(scale * halfHeightOverTan * tempX);// + half_w); int32 newX = floor((halfHeightOverTan * scale * temp) + halfWidth);
float cosX = cos(tempX); float cosX = cos(temp);
for (uint32 y = 0; y < _numColumns; y++) { for (uint32 y = 0; y < _numRows; y++) {
int32 newY = floor(halfHeight + (y - halfHeight) * cosX); int32 newY = floor(halfHeight + (y - halfHeight) * cosX);
uint32 index = x * _numColumns + y; // Panorama images are transposed. Rather than trying to transpose the source, we know
_internalBuffer[index].x = newX; //pixel index // they will be mutated by this table. Therefore we can swap the axes here
_internalBuffer[index].y = newY; //pixel index uint32 index = y * _numColumns + x;
_internalBuffer[index].x = newY; //pixel index
_internalBuffer[index].y = newX; //pixel index
} }
} }
} }

4
engines/zvision/render_table.h
View File

@ -57,13 +57,15 @@ private:
} _tiltOptions; } _tiltOptions;
public: public:
RenderState getRenderState() { return _renderState; }
void setRenderState(RenderState newState); void setRenderState(RenderState newState);
void mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 horizontalPitch, Common::Rect subRectangle);
private: private:
void generatePanoramaLookupTable(); void generatePanoramaLookupTable();
void generateTiltLookupTable(); void generateTiltLookupTable();
}; };
} // End of namesapce ZVision } // End of namespace ZVision
#endif #endif