2008-01-01 03:07:05 +00:00
|
|
|
/*
|
|
|
|
** fb_d3d9_wipe.cpp
|
|
|
|
** Implements the different screen wipes using Direct3D calls.
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
** Copyright 1998-2008 Randy Heit
|
|
|
|
** All rights reserved.
|
|
|
|
**
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
** are met:
|
|
|
|
**
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
**
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
|
|
|
|
// HEADER FILES ------------------------------------------------------------
|
|
|
|
|
|
|
|
#ifdef _DEBUG
|
|
|
|
#define D3D_DEBUG_INFO
|
|
|
|
#endif
|
|
|
|
#define DIRECT3D_VERSION 0x0900
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
|
|
|
|
#include <windows.h>
|
|
|
|
#include <d3d9.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#define USE_WINDOWS_DWORD
|
|
|
|
#include "doomtype.h"
|
|
|
|
#include "f_wipe.h"
|
|
|
|
#include "win32iface.h"
|
|
|
|
#include "templates.h"
|
|
|
|
#include "m_random.h"
|
|
|
|
|
|
|
|
// MACROS ------------------------------------------------------------------
|
|
|
|
|
|
|
|
// TYPES -------------------------------------------------------------------
|
|
|
|
|
|
|
|
class D3DFB::Wiper_Crossfade : public D3DFB::Wiper
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Wiper_Crossfade();
|
|
|
|
bool Run(int ticks, D3DFB *fb);
|
|
|
|
|
|
|
|
private:
|
|
|
|
int Clock;
|
|
|
|
};
|
|
|
|
|
|
|
|
class D3DFB::Wiper_Melt : public D3DFB::Wiper
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Wiper_Melt();
|
|
|
|
bool Run(int ticks, D3DFB *fb);
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Match the strip sizes that oldschool Doom used.
|
|
|
|
static const int WIDTH = 160, HEIGHT = 200;
|
|
|
|
int y[WIDTH];
|
|
|
|
};
|
|
|
|
|
|
|
|
class D3DFB::Wiper_Burn : public D3DFB::Wiper
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Wiper_Burn(D3DFB *fb);
|
|
|
|
~Wiper_Burn();
|
|
|
|
bool Run(int ticks, D3DFB *fb);
|
|
|
|
|
|
|
|
private:
|
|
|
|
static const int WIDTH = 64, HEIGHT = 64;
|
|
|
|
BYTE BurnArray[WIDTH * (HEIGHT + 5)];
|
|
|
|
IDirect3DTexture9 *BurnTexture;
|
|
|
|
int Density;
|
|
|
|
int BurnTime;
|
|
|
|
|
|
|
|
struct BURNVERTEX
|
|
|
|
{
|
|
|
|
FLOAT x, y, z, rhw;
|
|
|
|
FLOAT tu0, tv0;
|
|
|
|
FLOAT tu1, tv1;
|
|
|
|
};
|
|
|
|
#define D3DFVF_BURNVERTEX (D3DFVF_XYZRHW|D3DFVF_TEX2)
|
|
|
|
};
|
|
|
|
|
|
|
|
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
|
|
|
|
|
|
|
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
|
|
|
|
|
|
|
|
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
|
|
|
|
|
|
|
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
|
|
|
|
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
|
|
|
|
|
|
|
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
|
|
|
|
|
|
|
// CODE --------------------------------------------------------------------
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: WipeStartScreen
|
|
|
|
//
|
|
|
|
// Called before the current screen has started rendering. This needs to
|
|
|
|
// save what was drawn the previous frame so that it can be animated into
|
|
|
|
// what gets drawn this frame.
|
|
|
|
//
|
|
|
|
// In fullscreen mode, we use GetFrontBufferData() to grab the data that
|
|
|
|
// is visible on screen right now.
|
|
|
|
//
|
|
|
|
// In windowed mode, we can't do that because we'll get the whole desktop.
|
|
|
|
// Instead, we can conveniently use the TempRenderTexture, which is normally
|
|
|
|
// used for gamma-correcting copying the image to the back buffer.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DFB::WipeStartScreen(int type)
|
|
|
|
{
|
2008-01-12 06:27:13 +00:00
|
|
|
IDirect3DSurface9 *tsurf;
|
2008-01-01 03:07:05 +00:00
|
|
|
D3DSURFACE_DESC desc;
|
|
|
|
|
2008-02-14 04:58:45 +00:00
|
|
|
if (!Accel2D)
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
|
|
|
return Super::WipeStartScreen(type);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case wipe_Melt:
|
|
|
|
ScreenWipe = new Wiper_Melt;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case wipe_Burn:
|
|
|
|
ScreenWipe = new Wiper_Burn(this);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case wipe_Fade:
|
|
|
|
ScreenWipe = new Wiper_Crossfade;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2008-01-12 06:27:13 +00:00
|
|
|
InitialWipeScreen = GetCurrentScreen();
|
2008-01-01 03:07:05 +00:00
|
|
|
|
2008-01-29 18:20:05 +00:00
|
|
|
// Create another texture to copy the final wipe screen to so
|
|
|
|
// we can still gamma correct the wipe. Since this is just for
|
|
|
|
// gamma correction, it's okay to fail (though not desirable.)
|
|
|
|
if (PixelDoubling || (GammaFixerShader != NULL && Windowed))
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
2008-01-29 18:20:05 +00:00
|
|
|
if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &tsurf)))
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
2008-01-29 18:20:05 +00:00
|
|
|
if (FAILED(tsurf->GetDesc(&desc)) ||
|
|
|
|
FAILED(D3DDevice->CreateTexture(desc.Width, desc.Height,
|
|
|
|
1, D3DUSAGE_RENDERTARGET, desc.Format, D3DPOOL_DEFAULT,
|
|
|
|
&FinalWipeScreen, NULL)))
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
2008-01-29 18:20:05 +00:00
|
|
|
FinalWipeScreen = TempRenderTexture;
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
2008-01-29 18:20:05 +00:00
|
|
|
tsurf->Release();
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
2008-01-29 18:20:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FinalWipeScreen = TempRenderTexture;
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
2008-01-12 06:27:13 +00:00
|
|
|
|
|
|
|
// Make even fullscreen model render to the TempRenderTexture, so
|
|
|
|
// we can have a copy of the new screen readily available.
|
2008-01-01 03:07:05 +00:00
|
|
|
GatheringWipeScreen = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: WipeEndScreen
|
|
|
|
//
|
|
|
|
// The screen we want to animate to has just been drawn. This function is
|
|
|
|
// called in place of Update(), so it has not been Presented yet.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::WipeEndScreen()
|
|
|
|
{
|
2008-02-14 04:58:45 +00:00
|
|
|
if (!Accel2D)
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
|
|
|
Super::WipeEndScreen();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Don't do anything if there is no starting point.
|
|
|
|
if (InitialWipeScreen == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the whole screen was drawn without 2D accel, get it in to
|
|
|
|
// video memory now.
|
|
|
|
if (!In2D)
|
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
Begin2D(true);
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
|
2008-01-09 21:04:21 +00:00
|
|
|
EndBatch(); // Make sure all batched primitives have been drawn.
|
2008-01-06 04:03:33 +00:00
|
|
|
|
2008-01-01 03:07:05 +00:00
|
|
|
// Don't do anything if there is no ending point.
|
|
|
|
if (OldRenderTarget == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If these are different, reverse their roles so we don't need to
|
|
|
|
// waste time copying from TempRenderTexture to FinalWipeScreen.
|
|
|
|
swap(FinalWipeScreen, TempRenderTexture);
|
|
|
|
|
|
|
|
// At this point, InitialWipeScreen holds the screen we are wiping from.
|
|
|
|
// FinalWipeScreen holds the screen we are wiping to, which may be the
|
|
|
|
// same texture as TempRenderTexture.
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: WipeDo
|
|
|
|
//
|
|
|
|
// Perform the actual wipe animation. The number of tics since the last
|
|
|
|
// time this function was called is passed in. Returns true when the wipe
|
|
|
|
// is over. The first time this function has been called, the screen is
|
|
|
|
// still locked from before and EndScene() still has not been called.
|
|
|
|
// Successive times need to call BeginScene().
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DFB::WipeDo(int ticks)
|
|
|
|
{
|
2008-02-14 04:58:45 +00:00
|
|
|
if (!Accel2D)
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
|
|
|
return Super::WipeDo(ticks);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sanity checks.
|
|
|
|
if (InitialWipeScreen == NULL || FinalWipeScreen == NULL)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (GatheringWipeScreen)
|
|
|
|
{ // This is the first time we've been called for this wipe.
|
|
|
|
GatheringWipeScreen = false;
|
|
|
|
|
|
|
|
if (OldRenderTarget == NULL)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
D3DDevice->SetRenderTarget(0, OldRenderTarget);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // This is the second or later time we've been called for this wipe.
|
|
|
|
D3DDevice->BeginScene();
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
InScene = true;
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
2008-01-09 21:04:21 +00:00
|
|
|
SAFE_RELEASE( OldRenderTarget );
|
2008-01-29 18:20:05 +00:00
|
|
|
if (TempRenderTexture != NULL && TempRenderTexture != FinalWipeScreen)
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
|
|
|
IDirect3DSurface9 *targetsurf;
|
2008-01-02 05:21:48 +00:00
|
|
|
if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &targetsurf)))
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
if (SUCCEEDED(D3DDevice->GetRenderTarget(0, &OldRenderTarget)))
|
|
|
|
{
|
|
|
|
if (FAILED(D3DDevice->SetRenderTarget(0, targetsurf)))
|
|
|
|
{
|
|
|
|
// Setting the render target failed.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
targetsurf->Release();
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
In2D = 3;
|
2008-01-01 03:07:05 +00:00
|
|
|
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
EnableAlphaTest(FALSE);
|
2008-01-01 03:07:05 +00:00
|
|
|
bool done = ScreenWipe->Run(ticks, this);
|
|
|
|
DrawLetterbox();
|
|
|
|
return done;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: WipeCleanup
|
|
|
|
//
|
|
|
|
// Release any resources that were specifically created for the wipe.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void D3DFB::WipeCleanup()
|
|
|
|
{
|
|
|
|
if (ScreenWipe != NULL)
|
|
|
|
{
|
|
|
|
delete ScreenWipe;
|
|
|
|
ScreenWipe = NULL;
|
|
|
|
}
|
2008-01-09 21:04:21 +00:00
|
|
|
SAFE_RELEASE( InitialWipeScreen );
|
2008-01-01 03:07:05 +00:00
|
|
|
if (FinalWipeScreen != NULL && FinalWipeScreen != TempRenderTexture)
|
|
|
|
{
|
|
|
|
FinalWipeScreen->Release();
|
|
|
|
}
|
|
|
|
FinalWipeScreen = NULL;
|
|
|
|
GatheringWipeScreen = false;
|
2008-02-14 04:58:45 +00:00
|
|
|
if (!Accel2D)
|
2008-01-01 03:07:05 +00:00
|
|
|
{
|
|
|
|
Super::WipeCleanup();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFB::Wiper::~Wiper()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// WIPE: CROSSFADE ---------------------------------------------------------
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Crossfade Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFB::Wiper_Crossfade::Wiper_Crossfade()
|
|
|
|
: Clock(0)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Crossfade :: Run
|
|
|
|
//
|
|
|
|
// Fades the old screen into the new one over 32 ticks.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DFB::Wiper_Crossfade::Run(int ticks, D3DFB *fb)
|
|
|
|
{
|
|
|
|
Clock += ticks;
|
|
|
|
|
|
|
|
// Put the initial screen back to the buffer, presumably with DMA.
|
2008-01-02 05:21:48 +00:00
|
|
|
IDirect3DSurface9 *source = NULL, *target = NULL;
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
if (SUCCEEDED(fb->InitialWipeScreen->GetSurfaceLevel(0, &source)) &&
|
|
|
|
SUCCEEDED(fb->D3DDevice->GetRenderTarget(0, &target)))
|
|
|
|
{
|
|
|
|
fb->D3DDevice->UpdateSurface(source, NULL, target, NULL);
|
2008-01-02 05:21:48 +00:00
|
|
|
target->Release();
|
|
|
|
}
|
|
|
|
if (source != NULL)
|
|
|
|
{
|
|
|
|
source->Release();
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Draw the new screen on top of it.
|
2008-01-04 05:22:30 +00:00
|
|
|
FBVERTEX verts[4];
|
|
|
|
|
2008-01-29 18:20:05 +00:00
|
|
|
fb->CalcFullscreenCoords(verts, false, false, D3DCOLOR_COLORVALUE(0,0,0,Clock / 32.f), D3DCOLOR_RGBA(255,255,255,0));
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->D3DDevice->SetFVF(D3DFVF_FBVERTEX);
|
|
|
|
fb->SetTexture(0, fb->FinalWipeScreen);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
fb->SetAlphaBlend(D3DBLENDOP_ADD, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->SetPixelShader(fb->PlainShader);
|
2008-01-04 05:22:30 +00:00
|
|
|
fb->D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(FBVERTEX));
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
return Clock >= 32;
|
|
|
|
}
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
// WIPE: MELT --------------------------------------------------------------
|
|
|
|
|
2008-01-01 03:07:05 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Melt Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFB::Wiper_Melt::Wiper_Melt()
|
|
|
|
{
|
|
|
|
int i, r;
|
|
|
|
|
|
|
|
// setup initial column positions
|
|
|
|
// (y<0 => not ready to scroll yet)
|
|
|
|
y[0] = -(M_Random() & 15);
|
|
|
|
for (i = 1; i < WIDTH; ++i)
|
|
|
|
{
|
|
|
|
r = (M_Random()%3) - 1;
|
|
|
|
y[i] = clamp(y[i-1] + r, -15, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Melt :: Run
|
|
|
|
//
|
|
|
|
// Fades the old screen into the new one over 32 ticks.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DFB::Wiper_Melt::Run(int ticks, D3DFB *fb)
|
|
|
|
{
|
2008-01-02 05:21:48 +00:00
|
|
|
IDirect3DSurface9 *source = NULL, *target;
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
if (FAILED(fb->InitialWipeScreen->GetSurfaceLevel(0, &source)) ||
|
|
|
|
FAILED(fb->D3DDevice->GetRenderTarget(0, &target)))
|
|
|
|
{
|
|
|
|
// A fat lot of good we can do if we can't get these two surfaces.
|
2008-01-02 05:21:48 +00:00
|
|
|
if (source != NULL)
|
|
|
|
{
|
|
|
|
source->Release();
|
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Draw the new screen on the bottom.
|
2008-01-04 05:22:30 +00:00
|
|
|
FBVERTEX verts[4];
|
|
|
|
|
2008-01-29 18:20:05 +00:00
|
|
|
fb->CalcFullscreenCoords(verts, false, false, 0, 0xFFFFFFFF);
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->D3DDevice->SetFVF(D3DFVF_FBVERTEX);
|
|
|
|
fb->SetTexture(0, fb->FinalWipeScreen);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
fb->SetAlphaBlend(D3DBLENDOP(0));
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->SetPixelShader(fb->PlainShader);
|
2008-01-04 05:22:30 +00:00
|
|
|
fb->D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(FBVERTEX));
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
int i, dy;
|
2008-01-29 18:20:05 +00:00
|
|
|
int fbwidth = fb->Width;
|
|
|
|
int fbheight = fb->Height;
|
2008-01-08 01:48:33 +00:00
|
|
|
bool done = true;
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
// Copy the old screen in vertical strips on top of the new one.
|
|
|
|
while (ticks--)
|
|
|
|
{
|
|
|
|
done = true;
|
|
|
|
for (i = 0; i < WIDTH; i++)
|
|
|
|
{
|
|
|
|
if (y[i] < 0)
|
|
|
|
{
|
|
|
|
y[i]++;
|
|
|
|
done = false;
|
|
|
|
}
|
|
|
|
else if (y[i] < HEIGHT)
|
|
|
|
{
|
|
|
|
dy = (y[i] < 16) ? y[i]+1 : 8;
|
|
|
|
y[i] = MIN(y[i] + dy, HEIGHT);
|
|
|
|
done = false;
|
|
|
|
}
|
|
|
|
if (ticks == 0)
|
|
|
|
{ // Only draw for the final tick.
|
|
|
|
RECT rect;
|
|
|
|
POINT dpt;
|
|
|
|
|
2008-01-29 18:20:05 +00:00
|
|
|
dpt.x = i * fbwidth / WIDTH;
|
|
|
|
dpt.y = MAX(0, y[i] * fbheight / HEIGHT);
|
2008-01-01 03:07:05 +00:00
|
|
|
rect.left = dpt.x;
|
2008-01-02 05:21:48 +00:00
|
|
|
rect.top = fb->LBOffsetI;
|
2008-01-29 18:20:05 +00:00
|
|
|
rect.right = (i + 1) * fbwidth / WIDTH;
|
|
|
|
rect.bottom = fbheight - dpt.y + fb->LBOffsetI;
|
2008-01-02 05:21:48 +00:00
|
|
|
dpt.y += fb->LBOffsetI;
|
2008-01-01 03:07:05 +00:00
|
|
|
if (rect.bottom > rect.top)
|
|
|
|
{
|
|
|
|
fb->D3DDevice->UpdateSurface(source, &rect, target, &dpt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-01-02 05:21:48 +00:00
|
|
|
target->Release();
|
|
|
|
source->Release();
|
2008-01-01 03:07:05 +00:00
|
|
|
return done;
|
|
|
|
}
|
|
|
|
|
2008-01-02 05:21:48 +00:00
|
|
|
// WIPE: BURN --------------------------------------------------------------
|
|
|
|
|
2008-01-01 03:07:05 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Burn Constructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFB::Wiper_Burn::Wiper_Burn(D3DFB *fb)
|
|
|
|
{
|
|
|
|
Density = 4;
|
|
|
|
BurnTime = 0;
|
|
|
|
memset(BurnArray, 0, sizeof(BurnArray));
|
|
|
|
if (fb->BurnShader == NULL || FAILED(fb->D3DDevice->CreateTexture(WIDTH, HEIGHT, 1,
|
|
|
|
D3DUSAGE_DYNAMIC, D3DFMT_L8, D3DPOOL_DEFAULT, &BurnTexture, NULL)))
|
|
|
|
{
|
|
|
|
BurnTexture = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Burn Destructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
D3DFB::Wiper_Burn::~Wiper_Burn()
|
|
|
|
{
|
2008-01-09 21:04:21 +00:00
|
|
|
SAFE_RELEASE( BurnTexture );
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// D3DFB :: Wiper_Burn :: Run
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool D3DFB::Wiper_Burn::Run(int ticks, D3DFB *fb)
|
|
|
|
{
|
|
|
|
bool done;
|
|
|
|
|
|
|
|
BurnTime += ticks;
|
|
|
|
ticks *= 2;
|
|
|
|
|
|
|
|
// Make the fire burn
|
|
|
|
done = false;
|
|
|
|
while (!done && ticks--)
|
|
|
|
{
|
|
|
|
Density = wipe_CalcBurn(BurnArray, WIDTH, HEIGHT, Density);
|
|
|
|
done = (Density < 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the burn texture with the new burn data
|
|
|
|
D3DLOCKED_RECT lrect;
|
|
|
|
if (SUCCEEDED(BurnTexture->LockRect(0, &lrect, NULL, D3DLOCK_DISCARD)))
|
|
|
|
{
|
|
|
|
const BYTE *src = BurnArray;
|
|
|
|
BYTE *dest = (BYTE *)lrect.pBits;
|
|
|
|
for (int y = HEIGHT; y != 0; --y)
|
|
|
|
{
|
|
|
|
for (int x = WIDTH; x != 0; --x)
|
|
|
|
{
|
|
|
|
*dest++ = *src++;
|
|
|
|
}
|
|
|
|
dest += lrect.Pitch - WIDTH;
|
|
|
|
}
|
|
|
|
BurnTexture->UnlockRect(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Put the initial screen back to the buffer.
|
2008-01-02 05:21:48 +00:00
|
|
|
IDirect3DSurface9 *source = NULL, *target;
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
if (SUCCEEDED(fb->InitialWipeScreen->GetSurfaceLevel(0, &source)) &&
|
|
|
|
SUCCEEDED(fb->D3DDevice->GetRenderTarget(0, &target)))
|
|
|
|
{
|
|
|
|
fb->D3DDevice->UpdateSurface(source, NULL, target, NULL);
|
2008-01-02 05:21:48 +00:00
|
|
|
target->Release();
|
|
|
|
}
|
|
|
|
if (source != NULL)
|
|
|
|
{
|
|
|
|
source->Release();
|
2008-01-01 03:07:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Burn the new screen on top of it.
|
|
|
|
float top = fb->LBOffset - 0.5f;
|
|
|
|
float right = float(fb->Width) - 0.5f;
|
|
|
|
float bot = float(fb->Height) + top;
|
|
|
|
float texright = float(fb->Width) / float(fb->FBWidth);
|
|
|
|
float texbot = float(fb->Height) / float(fb->FBHeight);
|
|
|
|
|
|
|
|
BURNVERTEX verts[4] =
|
|
|
|
{
|
|
|
|
{ -0.5f, top, 0.5f, 1.f, 0.f, 0.f, 0, 0 },
|
|
|
|
{ right, top, 0.5f, 1.f, texright, 0.f, 1, 0 },
|
|
|
|
{ right, bot, 0.5f, 1.f, texright, texbot, 1, 1 },
|
|
|
|
{ -0.5f, bot, 0.5f, 1.f, 0.f, texbot, 0, 1 }
|
|
|
|
};
|
|
|
|
|
|
|
|
fb->D3DDevice->SetFVF(D3DFVF_BURNVERTEX);
|
|
|
|
fb->SetTexture(0, fb->FinalWipeScreen);
|
|
|
|
fb->SetTexture(1, BurnTexture);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
fb->SetAlphaBlend(D3DBLENDOP_ADD, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA);
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->SetPixelShader(fb->BurnShader);
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
if (fb->SM14)
|
|
|
|
{
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);
|
|
|
|
}
|
2008-01-01 03:07:05 +00:00
|
|
|
fb->D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(BURNVERTEX));
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
if (fb->SM14)
|
|
|
|
{
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
|
|
|
|
fb->D3DDevice->SetSamplerState(1, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
|
|
|
|
}
|
- Tried adding bilinear filtering support for paletted textures, but the
shader seems to be producing crappy output, so it's disabled for now.
Specifically, it produces distorted output at regular intervals for
textures that aren't power-of-2-sized, and it's still doing visible
filtering when the texture is rendered at its original size, so
obviously it's not doing something right.
- Fixed the use of power-of-2-sized native textures for smaller game
textures again.
- Fixed: D3DFB did not restore all the state it needed to after resetting
the device.
- Fixed: R_DrawTopBorder() must clip itself around the 3D view, since it's
now drawn later.
- With full software rendering, palette flashes once again effect the whole
screen.
Changes I neglected to put in the previous commit log:
- Moved the view border drawing into the 2D mode part. When using Begin2D()
now, the only part of the software buffer that gets updated to the screen
is the part with the actual 3D scene and only if you tell it to.
- Fixed a D3D memory leak on every frame in windowed mode and the same thing
for the screen wipes. Note to self: If it's an interface, be sure to
Release it, because it will be AddRef'ed before being returned to you.
- Moved the BlendView() call out of FBaseStatusBar::Draw() so that it can be
applied before copying the 3D scene to the screen underneath the 2D parts.
- Restored the console's darkening level to its old table-based amount.
- Fixed D3DFB::SetColorOverlay()'s incorrect calculations.
- Fixed the D3D screen wipes for letterboxed modes.
SVN r662 (trunk)
2008-01-03 05:39:36 +00:00
|
|
|
fb->D3DDevice->SetFVF(D3DFVF_FBVERTEX);
|
2008-01-01 03:07:05 +00:00
|
|
|
|
|
|
|
// The fire may not always stabilize, so the wipe is forced to end
|
|
|
|
// after an arbitrary maximum time.
|
|
|
|
return done || (BurnTime > 40);
|
|
|
|
}
|