renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00 · 2013-02-15 23:46:37 +00:00 · f6fb9eb602
commit f6fb9eb602
parent bff574e04e
120 changed files with 1277 additions and 1294 deletions
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 //
 #include "../qcommon/q_shared.h"
-#include "../renderer/tr_types.h"
+#include "../renderercommon/tr_types.h"
 #include "../game/bg_public.h"
 #include "cg_public.h"

--- a/code/client/client.h
+++ b/code/client/client.h
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 #include "../ui/ui_public.h"
 #include "keys.h"
 #include "snd_public.h"
--- a/code/null/null_glimp.c
+++ b/code/null/null_glimp.c
@ -19,7 +19,7 @@ along with Quake III Arena source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
-#include "../renderer/tr_local.h"
+#include "../renderergl1/tr_local.h"


 qboolean ( * qwglSwapIntervalEXT)( int interval );
--- a/code/q3_ui/ui_local.h
+++ b/code/q3_ui/ui_local.h
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define __UI_LOCAL_H__

 #include "../qcommon/q_shared.h"
-#include "../renderer/tr_types.h"
+#include "../renderercommon/tr_types.h"
 //NOTE: include the ui_public.h from the new UI
 #include "../ui/ui_public.h"
 //redefine to old API version
--- a/code/renderercommon/iqm.h
+++ b/code/renderercommon/iqm.h
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
--- a/code/renderercommon/tr_types.h
+++ b/code/renderercommon/tr_types.h
--- a/code/renderergl1/qgl.h
+++ b/code/renderergl1/qgl.h
--- a/code/renderergl1/tr_animation.c
+++ b/code/renderergl1/tr_animation.c
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
--- a/code/renderergl1/tr_curve.c
+++ b/code/renderergl1/tr_curve.c
--- a/code/renderergl1/tr_flares.c
+++ b/code/renderergl1/tr_flares.c
--- a/code/renderergl1/tr_font.c
+++ b/code/renderergl1/tr_font.c
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
--- a/code/renderergl1/tr_image_bmp.c
+++ b/code/renderergl1/tr_image_bmp.c
--- a/code/renderergl1/tr_image_jpg.c
+++ b/code/renderergl1/tr_image_jpg.c
--- a/code/renderergl1/tr_image_pcx.c
+++ b/code/renderergl1/tr_image_pcx.c
--- a/code/renderergl1/tr_image_png.c
+++ b/code/renderergl1/tr_image_png.c
--- a/code/renderergl1/tr_image_tga.c
+++ b/code/renderergl1/tr_image_tga.c
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
--- a/code/renderergl1/tr_light.c
+++ b/code/renderergl1/tr_light.c
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "tr_public.h"
+#include "../renderercommon/tr_public.h"
 #include "qgl.h"
-#include "iqm.h"
+#include "../renderercommon/iqm.h"

 #define GL_INDEX_TYPE		GL_UNSIGNED_INT
 typedef unsigned int glIndex_t;
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
--- a/code/renderergl1/tr_marks.c
+++ b/code/renderergl1/tr_marks.c
--- a/code/renderergl1/tr_mesh.c
+++ b/code/renderergl1/tr_mesh.c
--- a/code/renderergl1/tr_model.c
+++ b/code/renderergl1/tr_model.c
--- a/code/renderergl1/tr_model_iqm.c
+++ b/code/renderergl1/tr_model_iqm.c
--- a/code/renderergl1/tr_noise.c
+++ b/code/renderergl1/tr_noise.c
--- a/code/renderergl1/tr_scene.c
+++ b/code/renderergl1/tr_scene.c
--- a/code/renderergl1/tr_shade.c
+++ b/code/renderergl1/tr_shade.c
--- a/code/renderergl1/tr_shade_calc.c
+++ b/code/renderergl1/tr_shade_calc.c
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
--- a/code/renderergl1/tr_shadows.c
+++ b/code/renderergl1/tr_shadows.c
--- a/code/renderergl1/tr_sky.c
+++ b/code/renderergl1/tr_sky.c
--- a/code/renderergl1/tr_subs.c
+++ b/code/renderergl1/tr_subs.c
--- a/code/renderergl1/tr_surface.c
+++ b/code/renderergl1/tr_surface.c
--- a/code/renderergl1/tr_world.c
+++ b/code/renderergl1/tr_world.c
--- a/code/renderergl2/glsl/bokeh_fp.glsl
+++ b/code/renderergl2/glsl/bokeh_fp.glsl
--- a/code/renderergl2/glsl/bokeh_vp.glsl
+++ b/code/renderergl2/glsl/bokeh_vp.glsl
--- a/code/renderergl2/glsl/calclevels4x_fp.glsl
+++ b/code/renderergl2/glsl/calclevels4x_fp.glsl
--- a/code/renderergl2/glsl/calclevels4x_vp.glsl
+++ b/code/renderergl2/glsl/calclevels4x_vp.glsl
--- a/code/renderergl2/glsl/depthblur_fp.glsl
+++ b/code/renderergl2/glsl/depthblur_fp.glsl
--- a/code/renderergl2/glsl/depthblur_vp.glsl
+++ b/code/renderergl2/glsl/depthblur_vp.glsl
--- a/code/renderergl2/glsl/dlight_fp.glsl
+++ b/code/renderergl2/glsl/dlight_fp.glsl
--- a/code/renderergl2/glsl/dlight_vp.glsl
+++ b/code/renderergl2/glsl/dlight_vp.glsl
--- a/code/renderergl2/glsl/down4x_fp.glsl
+++ b/code/renderergl2/glsl/down4x_fp.glsl
--- a/code/renderergl2/glsl/down4x_vp.glsl
+++ b/code/renderergl2/glsl/down4x_vp.glsl
--- a/code/renderergl2/glsl/fogpass_fp.glsl
+++ b/code/renderergl2/glsl/fogpass_fp.glsl
--- a/code/renderergl2/glsl/fogpass_vp.glsl
+++ b/code/renderergl2/glsl/fogpass_vp.glsl
--- a/code/renderergl2/glsl/generic_fp.glsl
+++ b/code/renderergl2/glsl/generic_fp.glsl
--- a/code/renderergl2/glsl/generic_vp.glsl
+++ b/code/renderergl2/glsl/generic_vp.glsl
--- a/code/renderergl2/glsl/lightall_fp.glsl
+++ b/code/renderergl2/glsl/lightall_fp.glsl
--- a/code/renderergl2/glsl/lightall_vp.glsl
+++ b/code/renderergl2/glsl/lightall_vp.glsl
--- a/code/renderergl2/glsl/pshadow_fp.glsl
+++ b/code/renderergl2/glsl/pshadow_fp.glsl
--- a/code/renderergl2/glsl/pshadow_vp.glsl
+++ b/code/renderergl2/glsl/pshadow_vp.glsl
--- a/code/renderergl2/glsl/shadowfill_fp.glsl
+++ b/code/renderergl2/glsl/shadowfill_fp.glsl
--- a/code/renderergl2/glsl/shadowfill_vp.glsl
+++ b/code/renderergl2/glsl/shadowfill_vp.glsl
--- a/code/renderergl2/glsl/shadowmask_fp.glsl
+++ b/code/renderergl2/glsl/shadowmask_fp.glsl
--- a/code/renderergl2/glsl/shadowmask_vp.glsl
+++ b/code/renderergl2/glsl/shadowmask_vp.glsl
--- a/code/renderergl2/glsl/ssao_fp.glsl
+++ b/code/renderergl2/glsl/ssao_fp.glsl
--- a/code/renderergl2/glsl/ssao_vp.glsl
+++ b/code/renderergl2/glsl/ssao_vp.glsl
--- a/code/renderergl2/glsl/texturecolor_fp.glsl
+++ b/code/renderergl2/glsl/texturecolor_fp.glsl
--- a/code/renderergl2/glsl/texturecolor_vp.glsl
+++ b/code/renderergl2/glsl/texturecolor_vp.glsl
--- a/code/renderergl2/glsl/tonemap_fp.glsl
+++ b/code/renderergl2/glsl/tonemap_fp.glsl
--- a/code/renderergl2/glsl/tonemap_vp.glsl
+++ b/code/renderergl2/glsl/tonemap_vp.glsl
--- a/code/renderergl2/qgl.h
+++ b/code/renderergl2/qgl.h
--- a/code/renderergl2/tr_animation.c
+++ b/code/renderergl2/tr_animation.c
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
--- a/code/renderergl2/tr_curve.c
+++ b/code/renderergl2/tr_curve.c
--- a/code/renderergl2/tr_extensions.c
+++ b/code/renderergl2/tr_extensions.c
--- a/code/renderergl2/tr_extramath.c
+++ b/code/renderergl2/tr_extramath.c
--- a/code/renderergl2/tr_extramath.h
+++ b/code/renderergl2/tr_extramath.h
--- a/code/renderergl2/tr_extratypes.h
+++ b/code/renderergl2/tr_extratypes.h
--- a/code/renderergl2/tr_fbo.c
+++ b/code/renderergl2/tr_fbo.c
--- a/code/renderergl2/tr_fbo.h
+++ b/code/renderergl2/tr_fbo.h
--- a/code/renderergl2/tr_flares.c
+++ b/code/renderergl2/tr_flares.c
--- a/code/renderergl2/tr_font.c
+++ b/code/renderergl2/tr_font.c
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
--- a/code/renderergl2/tr_image_bmp.c
+++ b/code/renderergl2/tr_image_bmp.c
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 extern	refimport_t		ri;

 typedef struct
--- a/code/renderergl2/tr_image_jpg.c
+++ b/code/renderergl2/tr_image_jpg.c
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 extern	refimport_t		ri;

 /*
--- a/code/renderergl2/tr_image_pcx.c
+++ b/code/renderergl2/tr_image_pcx.c
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 extern	refimport_t		ri;

 /*
--- a/code/renderergl2/tr_image_png.c
+++ b/code/renderergl2/tr_image_png.c
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 extern	refimport_t		ri;

 #include "../qcommon/puff.h"
--- a/code/renderergl2/tr_image_tga.c
+++ b/code/renderergl2/tr_image_tga.c
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 extern	refimport_t		ri;

 /*
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@ -27,13 +27,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
+#include "../renderercommon/tr_public.h"
 #include "tr_extratypes.h"
 #include "tr_extramath.h"
 #include "tr_fbo.h"
 #include "tr_postprocess.h"
 #include "qgl.h"
-#include "../renderer/iqm.h"
+#include "../renderercommon/iqm.h"

 #define GL_INDEX_TYPE		GL_UNSIGNED_INT
 typedef unsigned int glIndex_t;
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
--- a/code/renderergl2/tr_marks.c
+++ b/code/renderergl2/tr_marks.c
--- a/code/renderergl2/tr_mesh.c
+++ b/code/renderergl2/tr_mesh.c
--- a/code/renderergl2/tr_model.c
+++ b/code/renderergl2/tr_model.c
--- a/code/renderergl2/tr_model_iqm.c
+++ b/code/renderergl2/tr_model_iqm.c
--- a/code/renderergl2/tr_noise.c
+++ b/code/renderergl2/tr_noise.c
--- a/code/renderergl2/tr_postprocess.c
+++ b/code/renderergl2/tr_postprocess.c
--- a/code/renderergl2/tr_postprocess.h
+++ b/code/renderergl2/tr_postprocess.h
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
--- a/Show more
+++ b/Show more