Changed POST_EFFECT_DISTORTION to POST_EFFECT_MINERAL
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# depslib dependency file v1.0
|
||||
1763875570 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp
|
||||
1763889330 source:/home/n00b/Projects/RCBASIC4/rcbasic_build/main.cpp
|
||||
<iostream>
|
||||
<stack>
|
||||
<vector>
|
||||
@@ -14,7 +14,7 @@
|
||||
"env_resolve.h"
|
||||
"identifier.h"
|
||||
|
||||
1762837889 /home/n00b/Projects/RCBASIC4/rcbasic_build/tokenizer.h
|
||||
1763959497 /home/n00b/Projects/RCBASIC4/rcbasic_build/tokenizer.h
|
||||
<iostream>
|
||||
<string>
|
||||
<cctype>
|
||||
|
||||
@@ -1300,29 +1300,29 @@ string rc_keywordToken(string sline)
|
||||
return "<num>0";
|
||||
else if(sline.compare("SPRITE_ORDER_DESCENDING")==0)
|
||||
return "<num>1";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_BLOOM")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_BLOOM")==0)
|
||||
return "<num>1";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_BLUR")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_BLUR")==0)
|
||||
return "<num>2";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_MOTION_BLUR")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_MOTION_BLUR")==0)
|
||||
return "<num>3";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_RADIAL_BLUR")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_RADIAL_BLUR")==0)
|
||||
return "<num>4";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_COLORIZE")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_COLORIZE")==0)
|
||||
return "<num>5";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_INVERT")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_INVERT")==0)
|
||||
return "<num>6";
|
||||
else if(sline.compare("POST_PROCESS_TYPE_DISTORTION")==0)
|
||||
else if(sline.compare("POST_EFFECT_TYPE_MINERAL")==0)
|
||||
return "<num>7";
|
||||
else if(sline.compare("POST_PROCESS_PROPERTY_STRENGTH")==0)
|
||||
else if(sline.compare("POST_EFFECT_PROPERTY_STRENGTH")==0)
|
||||
return "<num>1";
|
||||
else if(sline.compare("POST_PROCESS_PROPERTY_DISTANCE")==0)
|
||||
else if(sline.compare("POST_EFFECT_PROPERTY_DISTANCE")==0)
|
||||
return "<num>2";
|
||||
else if(sline.compare("POST_PROCESS_PROPERTY_MULTIPLIER")==0)
|
||||
else if(sline.compare("POST_EFFECT_PROPERTY_MULTIPLIER")==0)
|
||||
return "<num>3";
|
||||
else if(sline.compare("POST_PROCESS_PROPERTY_SATURATION")==0)
|
||||
else if(sline.compare("POST_EFFECT_PROPERTY_SATURATION")==0)
|
||||
return "<num>4";
|
||||
else if(sline.compare("POST_PROCESS_PROPERTY_COLOR")==0)
|
||||
else if(sline.compare("POST_EFFECT_PROPERTY_COLOR")==0)
|
||||
return "<num>5";
|
||||
else
|
||||
{
|
||||
|
||||
@@ -340,7 +340,7 @@ struct rc_spriteCanvasProperties
|
||||
#define RC_POST_PROCESS_RADIAL_BLUR 4
|
||||
#define RC_POST_PROCESS_COLORIZE 5
|
||||
#define RC_POST_PROCESS_INVERT 6
|
||||
#define RC_POST_PROCESS_DISTORTION 7
|
||||
#define RC_POST_PROCESS_MINERAL 7
|
||||
|
||||
// strength, distance, multiplier, saturation, color
|
||||
#define RC_PP_PROPERTY_STRENGTH 1
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define RC_OS_DEFINES_H_INCLUDED
|
||||
|
||||
//USED FOR TESTING ONLY
|
||||
#define RC_TESTING
|
||||
//#define RC_TESTING
|
||||
|
||||
//I am checking Android first since I think it also defines __linux__
|
||||
|
||||
|
||||
@@ -952,7 +952,7 @@ void rc_clearPostEffect(int canvas_id)
|
||||
}
|
||||
break;
|
||||
|
||||
case RC_POST_PROCESS_DISTORTION:
|
||||
case RC_POST_PROCESS_MINERAL:
|
||||
{
|
||||
IPostProcessGlass* post_process = (IPostProcessGlass*)rc_canvas[canvas_id].post_effect.object;
|
||||
post_process->remove();
|
||||
@@ -1070,7 +1070,7 @@ bool rc_setPostEffect(int canvas_id, int effect_type)
|
||||
}
|
||||
break;
|
||||
|
||||
case RC_POST_PROCESS_DISTORTION:
|
||||
case RC_POST_PROCESS_MINERAL:
|
||||
{
|
||||
IPostProcessGlass *Glass = new IPostProcessGlass(SceneManager->getRootSceneNode(), SceneManager, -1);
|
||||
float strength = 0.1;
|
||||
@@ -1129,7 +1129,7 @@ void rc_setPostEffectStrength(int canvas_id, double strength)
|
||||
}
|
||||
break;
|
||||
|
||||
case RC_POST_PROCESS_DISTORTION:
|
||||
case RC_POST_PROCESS_MINERAL:
|
||||
{
|
||||
IPostProcessGlass *Glass = (IPostProcessGlass*) rc_canvas[canvas_id].post_effect.object;
|
||||
Glass->callback->strength = (float)strength;
|
||||
@@ -1309,7 +1309,7 @@ double rc_getPostEffectStrength(int canvas_id)
|
||||
}
|
||||
break;
|
||||
|
||||
case RC_POST_PROCESS_DISTORTION:
|
||||
case RC_POST_PROCESS_MINERAL:
|
||||
{
|
||||
IPostProcessGlass *Glass = (IPostProcessGlass*) rc_canvas[canvas_id].post_effect.object;
|
||||
return (double)Glass->callback->strength;
|
||||
@@ -1528,7 +1528,7 @@ void rc_renderPostEffect(int canvas_id)
|
||||
}
|
||||
break;
|
||||
|
||||
case RC_POST_PROCESS_DISTORTION:
|
||||
case RC_POST_PROCESS_MINERAL:
|
||||
{
|
||||
IPostProcessGlass *Glass = (IPostProcessGlass*) rc_canvas[canvas_id].post_effect.object;
|
||||
Glass->render();
|
||||
|
||||
@@ -122,7 +122,7 @@ void rc_pipeline_Render()
|
||||
{
|
||||
if(rc_canvas[rc_active_canvas].post_effect.is_active)
|
||||
{
|
||||
if(rc_canvas[rc_active_canvas].post_effect.type == RC_POST_PROCESS_DISTORTION)
|
||||
if(rc_canvas[rc_active_canvas].post_effect.type == RC_POST_PROCESS_MINERAL)
|
||||
{
|
||||
IPostProcessGlass* post_process = (IPostProcessGlass*) rc_canvas[rc_active_canvas].post_effect.object;
|
||||
VideoDriver->setRenderTarget(post_process->rt0, true, true);
|
||||
|
||||
@@ -544,7 +544,7 @@ bool rc_update()
|
||||
{
|
||||
if(rc_canvas[canvas_id].post_effect.is_active)
|
||||
{
|
||||
if(rc_canvas[canvas_id].post_effect.type == RC_POST_PROCESS_DISTORTION)
|
||||
if(rc_canvas[canvas_id].post_effect.type == RC_POST_PROCESS_MINERAL)
|
||||
{
|
||||
IPostProcessGlass* post_process = (IPostProcessGlass*) rc_canvas[canvas_id].post_effect.object;
|
||||
VideoDriver->setRenderTarget(post_process->rt0, true, true);
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<irrtheora.h>
|
||||
"rc_func130_cases.h"
|
||||
|
||||
1763950133 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h
|
||||
1763959134 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h
|
||||
<TargetConditionals.h>
|
||||
|
||||
1763875558 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_defines.h
|
||||
@@ -1274,7 +1274,7 @@
|
||||
"rc_post_fx.h"
|
||||
<irrtheora.h>
|
||||
|
||||
1763871259 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx_core.h
|
||||
1763958975 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx_core.h
|
||||
"SDL.h"
|
||||
"btBulletDynamicsCommon.h"
|
||||
"BulletSoftBody/btSoftRigidDynamicsWorld.h"
|
||||
@@ -2552,7 +2552,7 @@
|
||||
|
||||
1758412944 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_camera.h
|
||||
|
||||
1763889169 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_windowclose.h
|
||||
1763959070 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_windowclose.h
|
||||
|
||||
1650940764 /usr/include/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
|
||||
"BulletCollision/CollisionShapes/btTriangleCallback.h"
|
||||
@@ -2746,12 +2746,12 @@
|
||||
<sstream>
|
||||
"rc_steam.h"
|
||||
|
||||
1763955457 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_render_control.h
|
||||
1763959070 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_render_control.h
|
||||
<irrlicht.h>
|
||||
"rc_gfx_core.h"
|
||||
"rc_post_fx.h"
|
||||
|
||||
1763885109 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_post_fx.h
|
||||
1763959070 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_post_fx.h
|
||||
<irrlicht.h>
|
||||
<cstdlib>
|
||||
"rc_gfx_core.h"
|
||||
|
||||
Reference in New Issue
Block a user