mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 01:25:28 +00:00
Code Issues Projects Releases Wiki Activity

added -Wall, removed all warnings thereafter

Browse Source 
- killed glConsole



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@324 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-08-14 01:24:39 +00:00
parent e526797597
commit 08aff7983d
17 changed files with 50 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/projectM-engine/CMakeLists.txt
View File

@ -2,9 +2,9 @@ PROJECT(projectM)
ADD_LIBRARY(projectM SHARED projectM.cpp projectM.hpp PBuffer.cpp PBuffer.hpp InitCond.cpp InitCond.hpp
Expr.cpp PCM.cpp Parser.cpp Preset.cpp Common.hpp BeatDetect.cpp PCM.hpp PerPixelEqn.cpp Eval.hpp
Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.hpp console_interface.h
Func.hpp Func.cpp Eval.cpp wipemalloc.h PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp glConsole.cpp console_interface.cpp
Func.hpp Func.cpp Eval.cpp wipemalloc.h PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp console_interface.cpp
CValue.hpp Expr.hpp timer.cpp wipemalloc.cpp PerFrameEqn.hpp PerPixelEqn.hpp PerPointEqn.hpp BuiltinFuncs.hpp
BuiltinFuncs.cpp compare.h event.h fatal.h fftsg.h glConsole.h timer.h BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp PresetFrameIO.cpp PresetFrameIO.hpp PresetMerge.cpp PresetMerge.hpp)
BuiltinFuncs.cpp compare.h event.h fatal.h fftsg.h timer.h BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp PresetFrameIO.cpp PresetFrameIO.hpp PresetMerge.cpp PresetMerge.hpp)
OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON)

10
src/projectM-engine/Common.hpp
View File

@ -83,16 +83,6 @@ inline void DWRITE( char *fmt, ... ) {
return;
va_list args;
va_start( args, fmt );
//#ifdef DEBUG
//#ifdef MACOS
// if ( debugFile != NULL ) {\
vprintf(fmt, args );
// fflush( debugFile );\
// } else {\
// printf( fmt, args );\
// }
//#endif
//#endif
va_end( args );
}

2
src/projectM-engine/CustomShape.cpp
View File

@ -232,7 +232,7 @@ void CustomShape::load_custom_shape_init()
traverse ( param_tree, fun );
}
void CustomShape::eval_custom_shape_init_conds()
void CustomShape::evalInitConds()
{
// NOTE: This is verified to be same behavior as trunk

2
src/projectM-engine/CustomShape.hpp
View File

@ -109,7 +109,7 @@ public:
int checkTrees();
void load_custom_shape_init();
void eval_custom_shape_init_conds();
void evalInitConds();
};

22
src/projectM-engine/CustomWave.cpp
View File

@ -46,20 +46,22 @@
CustomWave::CustomWave(int _id):
id(_id),
per_frame_count(0),
samples(512),
bSpectrum(0),
sep(1),
smoothing(0.0),
bUseDots(0),
bAdditive(0),
r(0),
g(0),
b(0),
a(0),
samples(512),
bSpectrum(0),
bUseDots(0),
bAdditive(0),
scaling(1.0),
smoothing(0.0),
per_point_eqn_string_index(0),
per_frame_eqn_string_index(0),
per_frame_init_eqn_string_index(0),
per_point_eqn_string_index(0)
per_frame_init_eqn_string_index(0)
{
Param * param;
@ -76,7 +78,7 @@ CustomWave::CustomWave(int _id):
this->sample_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float));
/* Start: Load custom wave parameters */
if ((param = Param::new_param_float("r", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->r, this->r_mesh, 1.0, 0.0, .5)) == NULL)
{
delete(this);
@ -507,7 +509,7 @@ int CustomWave::add_per_point_eqn(char * name, GenExpr * gen_expr)
}
void CustomWave::eval_custom_wave_init_conds()
void CustomWave::evalInitConds()
{
for (std::map<std::string, InitCond*>::iterator pos = init_cond_tree.begin(); pos != init_cond_tree.end(); ++pos)

2
src/projectM-engine/CustomWave.hpp
View File

@ -131,7 +131,7 @@ public:
void load_unspecified_init_conds();
void eval_custom_wave_init_conds();
void evalInitConds();
};

4
src/projectM-engine/PBuffer.cpp
View File

@ -48,7 +48,7 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : usePbuffers(fal
{
glewInit();
GLuint fb, color_rb, depth_rb, rgba_tex, depth_tex, i, other_tex;
GLuint fb, depth_rb, rgba_tex, other_tex;
glGenFramebuffersEXT(1, &fb);
glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb );
@ -91,7 +91,7 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : usePbuffers(fal
}
#endif
fallback:
DWRITE( "using teximage hack fallback\n" );
/** Fallback pbuffer creation via teximage hack */

11
src/projectM-engine/Param.cpp
View File

@ -45,8 +45,8 @@ Param::Param( std::string _name, short int _type, short int _flags, void * _engi
type(_type),
flags (_flags),
matrix_flag (0),
matrix (_matrix),
engine_val(_engine_val),
matrix (_matrix),
default_init_val (_default_init_val),
upper_bound (_upper_bound),
lower_bound (_lower_bound)
@ -62,11 +62,11 @@ Param::Param( std::string _name, short int _type, short int _flags, void * _engi
/* Creates a user defined parameter */
Param::Param(std::string _name) :
name(_name),
type(P_TYPE_DOUBLE),
flags(P_FLAG_USERDEF),
flags(P_FLAG_USERDEF),
matrix_flag(0),
matrix(0),
name(_name)
matrix(0)
{
engine_val = new float();
@ -148,6 +148,7 @@ Param * Param::new_param_float(char * name, short int flags, void * engine_val,
Param * param;
CValue iv, ub, lb;
assert(engine_val);
iv.float_val = init_val;
ub.float_val = upper_bound;
@ -167,6 +168,7 @@ Param * Param::new_param_int(char * name, short int flags, void * engine_val,
Param * param;
CValue iv, ub, lb;
assert(engine_val);
iv.int_val = init_val;
ub.int_val = upper_bound;
@ -186,6 +188,7 @@ Param * Param::new_param_bool(char * name, short int flags, void * engine_val,
Param * param;
CValue iv, ub, lb;
assert(engine_val);
iv.bool_val = init_val;
ub.bool_val = upper_bound;

14
src/projectM-engine/Parser.cpp
View File

@ -377,14 +377,6 @@ int Parser::parse_line(FILE * fs, Preset * preset) {
line_mode = CUSTOM_WAVE_WAVECODE_LINE_MODE;
//if (PARSE_DEBUG)
// printf("parse_line: wavecode prefix found: \"%s\"\n", eqn_string);
// printf("string:%d\n", 5);
//SUPER MYSTERIO-BUG - Don't Remove
printf("");
return parse_wavecode(eqn_string, fs, preset);
}
@ -484,7 +476,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) {
return PROJECTM_SUCCESS;
} else if (line_mode == PER_PIXEL_LINE_MODE) {
if (PARSE_DEBUG) printf("parse_line: implicit per pixel eqn\n", line_count);
if (PARSE_DEBUG) printf("parse_line: implicit per pixel eqn (LINE %d)\n", line_count);
return parse_per_pixel_eqn(fs, preset, eqn_string);
@ -1726,7 +1718,6 @@ int Parser::parse_wave(char * token, FILE * fs, Preset * preset) {
return PROJECTM_FAILURE;
}
int last_custom_wave_id = id;
strncpy(last_eqn_type, eqn_type, MAX_TOKEN_SIZE);
return parse_wave_helper(fs, preset, id, eqn_type, 0);
@ -1884,9 +1875,8 @@ int Parser::parse_shape(char * token, FILE * fs, Preset * preset) {
int id;
char * eqn_type;
char string[MAX_TOKEN_SIZE];
CustomShape * custom_shape;
InitCond * init_cond;
if (token == NULL)

5
src/projectM-engine/PerPointEqn.cpp
View File

@ -73,9 +73,10 @@ if (!param->matrix_flag)
PerPointEqn::PerPointEqn(int _index, Param * _param, GenExpr * _gen_expr, int _samples):
index(_index),
samples(_samples),
param(_param),
gen_expr(_gen_expr),
samples(_samples)
gen_expr(_gen_expr)
{}

13
src/projectM-engine/Preset.cpp
View File

@ -37,10 +37,10 @@
#include <iostream>
Preset::Preset(const std::string & filename, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
file_path(filename),
builtinParams(presetInputs, presetOutputs),
customWaves(&presetOutputs.customWaves),
customShapes(&presetOutputs.customShapes),
file_path(filename),
m_presetOutputs(presetOutputs)
{
@ -133,8 +133,6 @@ int Preset::add_per_pixel_eqn(char * name, GenExpr * gen_expr)
}
if (PER_PIXEL_EQN_DEBUG) printf("add_per_pixel_eqn: new equation (index = %d,matrix=%X) (param = \"%s\")\n",
per_pixel_eqn->index, per_pixel_eqn->param->matrix, per_pixel_eqn->param->name.c_str());
/* Insert the per pixel equation into the preset per pixel database */
std::pair<std::map<int, PerPixelEqn*>::iterator, bool> inserteeOption = per_pixel_eqn_tree.insert
@ -155,7 +153,7 @@ void Preset::evalCustomShapeInitConditions()
{
for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos)
pos->second->eval_custom_shape_init_conds();
pos->second->evalInitConds();
}
@ -163,7 +161,7 @@ void Preset::evalCustomWaveInitConditions()
{
for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos)
pos->second->eval_custom_wave_init_conds();
pos->second->evalInitConds();
}
@ -179,6 +177,7 @@ void Preset::evalCustomWavePerFrameEquations()
assert(_pos->second);
_pos->second->evaluate();
}
std::map<int, PerFrameEqn*> & per_frame_eqn_tree = pos->second->per_frame_eqn_tree;
for (std::map<int, PerFrameEqn*>::iterator _pos = per_frame_eqn_tree.begin(); _pos != per_frame_eqn_tree.end(); ++_pos)
{
@ -287,7 +286,7 @@ void Preset::initialize(const std::string & pathname)
void Preset::loadBuiltinParamsUnspecInitConds() {
std::cerr << "builtin params unspec" << std::endl;
InitCondUtils::LoadUnspecInitCond loadUnspecInitCond(this->init_cond_tree, this->per_frame_init_eqn_tree);
this->builtinParams.traverse(loadUnspecInitCond);
@ -297,6 +296,7 @@ void Preset::loadBuiltinParamsUnspecInitConds() {
void Preset::loadCustomWaveUnspecInitConds()
{
std::cerr << "custom wave unspec" << std::endl;
for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos)
{
assert(pos->second);
@ -308,6 +308,7 @@ void Preset::loadCustomWaveUnspecInitConds()
void Preset::loadCustomShapeUnspecInitConds()
{
std::cerr << "custom shape unspec" << std::endl;
for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos)
{
assert(pos->second);

4
src/projectM-engine/PresetChooser.hpp
View File

@ -96,7 +96,7 @@ public:
};
/// An STL-esque iterator to beginning traversing presets from a directory
/// An STL-esque iterator to begin traversing presets from a directory
/// \returns the position of the first preset in the collection
PresetIterator begin();
@ -188,7 +188,7 @@ inline PresetIterator PresetChooser::end() const {
template <class WeightFunctor>
std::auto_ptr<Preset> PresetChooser::weightedRandom(const PresetInputs & presetInputs, PresetOutputs & presetOutputs, WeightFunctor & weightFunctor) {
doWeightedSample(weightFunctor);
return doWeightedSample(weightFunctor);
}
template <class WeightFunctor>

3
src/projectM-engine/Renderer.cpp
View File

@ -646,10 +646,8 @@ void Renderer::draw_shapes(PresetOutputs *presetOutputs) {
int i;
float theta;
float radius;
CustomShape *pos;
float pi = 3.14159265;
float start,inc,xval,yval;
@ -806,7 +804,6 @@ void Renderer::draw_waveform(PresetOutputs *presetOutputs, PresetInputs *presetI
float wave_x_temp=0;
float wave_y_temp=0;
float dy_adj;
float xx,yy;
float cos_rot;
float sin_rot;

7
src/projectM-engine/console_interface.cpp
View File

@ -64,6 +64,7 @@ void projectM::key_handler( projectMEvent event,
switch( event ) {
case PROJECTM_KEYDOWN:
//default_key_handler();
@ -91,6 +92,9 @@ void projectM::key_handler( projectMEvent event,
}
break;
default:
break;
}
}
@ -234,5 +238,8 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
default:
break;
}
default:
break;
}
}

1028
src/projectM-engine/glConsole.cpp
View File

File diff suppressed because it is too large Load Diff

114
src/projectM-engine/glConsole.h
View File

@ -1,114 +0,0 @@
/**
* projectM -- Milkdrop-esque visualisation SDK
* Copyright (C)2003-2007 projectM Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* See 'LICENSE.txt' included within this release
*
*/
/**
* $Id$
*
*
* $Log$
*/
#ifndef _GLCONSOLE_H
#define _GLCONSOLE_H
#define GL_CONSOLE_DEBUG 0
#define MAX_CONSOLE_HEIGHT 500
#define MAX_CONSOLE_WIDTH 500
#define CONSOLE_FLAG_NONE 0
#define CONSOLE_FLAG_CURSOR_HIDDEN 1
#define CONSOLE_FLAG_CURSOR_BLINKING (1 << 1)
#define CONSOLE_FLAG_SCROLL_WRAP_RIGHT (1 << 3)
#define CONSOLE_FLAG_SCROLL_WRAP_LEFT (1 << 4)
#define CONSOLE_FLAG_SCROLL_WRAP_UP (1 << 5)
#define CONSOLE_FLAG_SCROLL_WRAP_DOWN (1 << 6)
#define CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND (1 << 7)
#define BAR_STYLE 0
#define UNDERLINE_STYLE 1
typedef enum {
CONSOLE_RED,
CONSOLE_BLACK,
CONSOLE_BLUE,
CONSOLE_WHITE,
CONSOLE_GREEN,
CONSOLE_TRANS
} color_t;
typedef struct CONSOLE_CHAR_T {
char symbol;
color_t fg_color;
color_t bg_color;
} console_char_t;
typedef struct GL_CONSOLE_T {
float start_x;
float start_y;
int screen_width;
int screen_height;
int scroll_width;
int scroll_height;
console_char_t * screen_buffer; /* start of current screen buffer */
console_char_t * scroll_buffer; /* pointer to very top of buffer */
int font_descriptor;
int screen_x;
int screen_y;
int screen_start_x;
int screen_start_y;
int cursor_style;
color_t current_fg;
color_t current_bg;
color_t cursor_color;
console_char_t * cursor_ptr; /* pointer to position in console buffer */
short int flags;
} gl_console_t;
int glConsoleSetFGColor(color_t color, gl_console_t * gl_console);
int glConsoleSetBGColor(color_t color, gl_console_t * gl_console);
int glConsoleSetCursorColor(color_t color, gl_console_t * gl_console);
int glConsoleSetCursorPos(int x, int y, gl_console_t * gl_console);
int glConsoleGetCursorPos(int * x, int * y, gl_console_t * gl_console);
int glConsoleShowCursor(gl_console_t * console);
int glConsoleHideCursor(gl_console_t * console);
int glConsoleDraw( gl_console_t * console);
int glConsoleClearScreen(gl_console_t * console);
int glConsoleClearBuffer(gl_console_t * console);
int glConsolePrintString(char * s, gl_console_t * console);
int glConsoleSetFlags(int flags, gl_console_t * console);
int glConsoleSetCursorStyle(int style_num, gl_console_t * console);
int glConsoleAlignCursorRight(gl_console_t * gl_console);
int glConsoleAlignCursorLeft(gl_console_t * gl_console);
int glConsoleAlignCursorUp(gl_console_t * gl_console);
int glConsoleAlignCursorDown(gl_console_t * gl_console);
int glConsoleMoveCursorForward(gl_console_t * gl_console);
int glConsoleMoveCursorBackward(gl_console_t * gl_console);
int glConsoleMoveCursorUp(gl_console_t * gl_console);
int glConsoleMoveCursorDown(gl_console_t * gl_console);
int glConsoleStartShell(gl_console_t * gl_console);
int glConsoleCopyBuffer(char * src, int len, gl_console_t * gl_console);
int glConsoleCursorToNextChar(char c, gl_console_t * gl_console);
gl_console_t * glConsoleCreate(int screen_width, int screen_height, int scroll_width, int scroll_height,
float start_x, float start_y, int font_descriptor);
int glConsoleDestroy(gl_console_t * console);
#endif /** !_GLCONSOLE_H */

7
src/projectM-engine/projectM.cpp
View File

@ -77,7 +77,7 @@ float smoothTime = 5;
//int smoothFrame = 0;
int oldFrame = 0;
DLLEXPORT projectM::projectM() :beatDetect ( 0 )
DLLEXPORT projectM::projectM() :smoothFrame(0),beatDetect ( 0 )
{
}
@ -722,8 +722,7 @@ DLLEXPORT void projectM::projectM_resetGL ( int w, int h )
{
int mindim, origtexsize;
DWRITE ( "projectM_resetGL(): in: %d x %d\n", w, h );
/** Stash the new dimensions */
@ -803,7 +802,7 @@ int projectM::initPresetTools()
// First preset
std::cerr << "[projectM] Allocating first preset..." << std::endl;
m_activePreset = m_presetPos->allocate ( presetInputs, presetOutputs );
// m_activePreset2 = m_p
std::cerr << "[projectM] First preset allocated. File path is \"" << m_activePreset->absoluteFilePath() << "\"" << std::endl;
projectM_resetengine();