zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-17 17:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change camera texture FOV to doubles.

Browse source
This commit is contained in:
nashmuhandes 2017-09-01 04:37:29 +08:00 committed by Christoph Oelckers
parent b80bf6930a
commit f96f71044f
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/scene/gl_scene.cpp
View file

@ -987,7 +987,7 @@ struct FGLInterface : public FRenderer
void WriteSavePic (player_t *player, FileWriter *file, int width, int height) override; void WriteSavePic (player_t *player, FileWriter *file, int width, int height) override;
void StartSerialize(FSerializer &arc) override; void StartSerialize(FSerializer &arc) override;
void EndSerialize(FSerializer &arc) override; void EndSerialize(FSerializer &arc) override;
void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, int fov) override; void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override; void CleanLevelData() override;
bool RequireGLNodes() override; bool RequireGLNodes() override;
@ -1098,7 +1098,7 @@ void FGLInterface::Init()
CVAR(Bool, gl_usefb, false , CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(Bool, gl_usefb, false , CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
extern TexFilter_s TexFilter[]; extern TexFilter_s TexFilter[];
void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, int FOV) void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, double FOV)
{ {
FMaterial * gltex = FMaterial::ValidateTexture(tex, false); FMaterial * gltex = FMaterial::ValidateTexture(tex, false);

2
src/p_acs.cpp
View file

@ -10041,7 +10041,7 @@ scriptwait:
} }
else else
{ {
FCanvasTextureInfo::Add (camera, picnum, STACK(1)); FCanvasTextureInfo::Add (camera, picnum, ACSToDouble(STACK(1)));
} }
} }
sp -= 3; sp -= 3;

2
src/r_renderer.h
View file

@ -49,7 +49,7 @@ struct FRenderer
virtual void OnModeSet () {} virtual void OnModeSet () {}
virtual void SetClearColor(int color) = 0; virtual void SetClearColor(int color) = 0;
virtual void Init() = 0; virtual void Init() = 0;
virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) = 0; virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0;
virtual void PreprocessLevel() {} virtual void PreprocessLevel() {}
virtual void CleanLevelData() {} virtual void CleanLevelData() {}
virtual bool RequireGLNodes() { return false; } virtual bool RequireGLNodes() { return false; }

6
src/r_utility.cpp
View file

@ -1014,7 +1014,7 @@ void R_SetupFrame (FRenderViewpoint &viewpoint, FViewWindow &viewwindow, AActor
// //
//========================================================================== //==========================================================================
void FCanvasTextureInfo::Add (AActor *viewpoint, FTextureID picnum, int fov) void FCanvasTextureInfo::Add (AActor *viewpoint, FTextureID picnum, double fov)
{ {
FCanvasTextureInfo *probe; FCanvasTextureInfo *probe;
FCanvasTexture *texture; FCanvasTexture *texture;
@ -1062,7 +1062,7 @@ DEFINE_ACTION_FUNCTION(_TexMan, SetCameraToTexture)
PARAM_PROLOGUE; PARAM_PROLOGUE;
PARAM_OBJECT(viewpoint, AActor); PARAM_OBJECT(viewpoint, AActor);
PARAM_STRING(texturename); // [ZZ] there is no point in having this as FTextureID because it's easier to refer to a cameratexture by name and it isn't executed too often to cache it. PARAM_STRING(texturename); // [ZZ] there is no point in having this as FTextureID because it's easier to refer to a cameratexture by name and it isn't executed too often to cache it.
PARAM_INT(fov); PARAM_FLOAT(fov);
FTextureID textureid = TexMan.CheckForTexture(texturename, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable); FTextureID textureid = TexMan.CheckForTexture(texturename, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable);
FCanvasTextureInfo::Add(viewpoint, textureid, fov); FCanvasTextureInfo::Add(viewpoint, textureid, fov);
return 0; return 0;
@ -1150,7 +1150,7 @@ void FCanvasTextureInfo::Serialize(FSerializer &arc)
if (arc.BeginArray("canvastextures")) if (arc.BeginArray("canvastextures"))
{ {
AActor *viewpoint = nullptr; AActor *viewpoint = nullptr;
int fov; double fov;
FTextureID picnum; FTextureID picnum;
while (arc.BeginObject(nullptr)) while (arc.BeginObject(nullptr))
{ {

4
src/r_utility.h
View file

@ -136,9 +136,9 @@ struct FCanvasTextureInfo
TObjPtr<AActor*> Viewpoint; TObjPtr<AActor*> Viewpoint;
FCanvasTexture *Texture; FCanvasTexture *Texture;
FTextureID PicNum; FTextureID PicNum;
int FOV; double FOV;
static void Add (AActor *viewpoint, FTextureID picnum, int fov); static void Add (AActor *viewpoint, FTextureID picnum, double fov);
static void UpdateAll (); static void UpdateAll ();
static void EmptyList (); static void EmptyList ();
static void Serialize(FSerializer &arc); static void Serialize(FSerializer &arc);

4
src/swrenderer/r_swrenderer.cpp
View file

@ -272,7 +272,7 @@ void FSoftwareRenderer::SetClearColor(int color)
mScene.SetClearColor(color); mScene.SetClearColor(color);
} }
void FSoftwareRenderer::RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) void FSoftwareRenderer::RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov)
{ {
auto renderTarget = r_polyrenderer ? PolyRenderer::Instance()->RenderTarget : mScene.MainThread()->Viewport->RenderTarget; auto renderTarget = r_polyrenderer ? PolyRenderer::Instance()->RenderTarget : mScene.MainThread()->Viewport->RenderTarget;
auto &cameraViewpoint = r_polyrenderer ? PolyRenderer::Instance()->Viewpoint : mScene.MainThread()->Viewport->viewpoint; auto &cameraViewpoint = r_polyrenderer ? PolyRenderer::Instance()->Viewpoint : mScene.MainThread()->Viewport->viewpoint;
@ -290,7 +290,7 @@ void FSoftwareRenderer::RenderTextureView (FCanvasTexture *tex, AActor *viewpoin
CameraLight savedCameraLight = *CameraLight::Instance(); CameraLight savedCameraLight = *CameraLight::Instance();
DAngle savedfov = cameraViewpoint.FieldOfView; DAngle savedfov = cameraViewpoint.FieldOfView;
R_SetFOV (cameraViewpoint, (double)fov); R_SetFOV (cameraViewpoint, fov);
if (r_polyrenderer) if (r_polyrenderer)
PolyRenderer::Instance()->RenderViewToCanvas(viewpoint, Canvas, 0, 0, tex->GetWidth(), tex->GetHeight(), tex->bFirstUpdate); PolyRenderer::Instance()->RenderViewToCanvas(viewpoint, Canvas, 0, 0, tex->GetWidth(), tex->GetHeight(), tex->bFirstUpdate);

2
src/swrenderer/r_swrenderer.h
View file

@ -30,7 +30,7 @@ struct FSoftwareRenderer : public FRenderer
void OnModeSet() override; void OnModeSet() override;
void SetClearColor(int color) override; void SetClearColor(int color) override;
void Init() override; void Init() override;
void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) override; void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override; void CleanLevelData() override;

2
wadsrc/static/zscript/base.txt
View file

@ -95,7 +95,7 @@ struct TexMan
native static Vector2 GetScaledOffset(TextureID tex); native static Vector2 GetScaledOffset(TextureID tex);
native static int CheckRealHeight(TextureID tex); native static int CheckRealHeight(TextureID tex);
native static void SetCameraToTexture(Actor viewpoint, String texture, int fov); native static void SetCameraToTexture(Actor viewpoint, String texture, double fov);
} }
enum DrawTextureTags enum DrawTextureTags