[Prboom-notes] r2570 - branches/prboom-plus-24/prboom2/src

[<ent...@ma...>]

Author: entryway
Date: Fri Aug 10 08:31:56 2007
New Revision: 2570

Modified:
   branches/prboom-plus-24/prboom2/src/Makefile.am
   branches/prboom-plus-24/prboom2/src/e6y.c
   branches/prboom-plus-24/prboom2/src/e6y.h
   branches/prboom-plus-24/prboom2/src/gl_main.c

Log:
scroll stuff from the latest revisions is temporally disabled
fix compilation problems

Modified: branches/prboom-plus-24/prboom2/src/Makefile.am
==============================================================================
--- branches/prboom-plus-24/prboom2/src/Makefile.am	(original)
+++ branches/prboom-plus-24/prboom2/src/Makefile.am	Fri Aug 10 08:31:56 2007
@@ -52,13 +52,13 @@
  r_patch.c      r_patch.h          r_fps.c          r_fps.h \
  e6y.c          e6y.h              i_simd.c         i_simd.h \
  r_filter.c     r_filter.h         r_drawcolumn.inl r_drawflush.inl \
- r_drawspan.inl i_pcsound.c        i_pcsound.h      gl_wipe.c
+ r_drawspan.inl i_pcsound.c        i_pcsound.h
 
 NET_CLIENT_SRC = d_client.c
 
 if BUILD_GL
 USE_GL_SRC = \
-  gl_detail.c  gl_intern.h  gl_main.c  gl_struct.h  gl_texture.c  gl_vertex.c
+  gl_detail.c  gl_intern.h  gl_main.c  gl_struct.h  gl_texture.c  gl_vertex.c  gl_wipe.c
 else
 USE_GL_SRC =
 endif

Modified: branches/prboom-plus-24/prboom2/src/e6y.c
==============================================================================
--- branches/prboom-plus-24/prboom2/src/e6y.c	(original)
+++ branches/prboom-plus-24/prboom2/src/e6y.c	Fri Aug 10 08:31:56 2007
@@ -211,6 +211,7 @@
 float tan_pitch;
 float skyUpAngle;
 float skyUpShift;
+float skyXShift;
 float skyYShift;
 boolean mlook_or_fov;
 int real_viewangle;

Modified: branches/prboom-plus-24/prboom2/src/e6y.h
==============================================================================
--- branches/prboom-plus-24/prboom2/src/e6y.h	(original)
+++ branches/prboom-plus-24/prboom2/src/e6y.h	Fri Aug 10 08:31:56 2007
@@ -213,6 +213,7 @@
 extern float tan_pitch;
 extern float skyUpAngle;
 extern float skyUpShift;
+extern float skyXShift;
 extern float skyYShift;
 extern boolean mlook_or_fov;
 extern int real_viewangle;

Modified: branches/prboom-plus-24/prboom2/src/gl_main.c
==============================================================================
--- branches/prboom-plus-24/prboom2/src/gl_main.c	(original)
+++ branches/prboom-plus-24/prboom2/src/gl_main.c	Fri Aug 10 08:31:56 2007
@@ -1726,6 +1726,7 @@
   {
     pitch=(float)(float)(viewpitch>>ANGLETOFINESHIFT)*360.0f/FINEANGLES;
     viewPitch = (pitch>180 ? pitch-360 : pitch);
+    skyXShift = -2.0f*((yaw+90.0f)/90.0f/fovscale);
     skyYShift = viewPitch<skyUpAngle ? skyUpShift : (float)sin(viewPitch*__glPi/180.0f)-0.2f;
   }
   paperitems_pitch=(float)(viewpitch>>ANGLETOFINESHIFT)*360.0f/FINEANGLES;
@@ -1899,7 +1900,7 @@
           glScalef(-k/(float)wall->gltexture->buffer_width*fovscale,200.0f/320.0f*fovscale,1.0f);
         else
           glScalef(+k/(float)wall->gltexture->buffer_width*fovscale,200.0f/320.0f*fovscale,1.0f);
-        glTranslatef(wall->skyyaw,wall->skyymid+skyYShift,0.0f);
+        glTranslatef(skyXShift/*wall->skyyaw*/,/*wall->skyymid+*/skyYShift,0.0f);
       }
 
       if (!SkyDrawed)