aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes/UVisualizer.pas
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-12-07 02:32:44 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-12-07 02:32:44 +0000
commit2e41ddbf9dc84772cdc9c8a9ab80d4861d6e4177 (patch)
tree903fd63a023fec2bde90cf8f59a9a06e264f727b /Game/Code/Classes/UVisualizer.pas
parent842af29c79390c0f78c2f004b463fe555ab01430 (diff)
downloadusdx-2e41ddbf9dc84772cdc9c8a9ab80d4861d6e4177.tar.gz
usdx-2e41ddbf9dc84772cdc9c8a9ab80d4861d6e4177.tar.xz
usdx-2e41ddbf9dc84772cdc9c8a9ab80d4861d6e4177.zip
Fixed some linux visualizer errors
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@694 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes/UVisualizer.pas')
-rw-r--r--Game/Code/Classes/UVisualizer.pas18
1 files changed, 5 insertions, 13 deletions
diff --git a/Game/Code/Classes/UVisualizer.pas b/Game/Code/Classes/UVisualizer.pas
index fc5eacbf..fa737d81 100644
--- a/Game/Code/Classes/UVisualizer.pas
+++ b/Game/Code/Classes/UVisualizer.pas
@@ -97,7 +97,6 @@ begin
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
end;
function TVideoPlayback_ProjectM.GetName: String;
@@ -180,19 +179,12 @@ begin
New(pm);
projectM_reset(pm);
- writeln('Render Target');
- writeln( inttostr( integer( assigned(pm^.renderTarget) ) ) );
-
pm^.fullscreen := 0;
- pm^.gx := gx;
- pm^.gy := gy;
+ pm^.renderTarget^.texsize := texsize;
+ pm^.gx := gx;
+ pm^.gy := gy;
pm^.fps := fps;
-
- if assigned(pm^.renderTarget) then
- begin
- pm^.renderTarget^.texsize := texsize;
- pm^.renderTarget^.usePbuffers := 0;
- end;
+ pm^.renderTarget^.usePbuffers := 0;
pm^.fontURL := PChar(projectM_Dir+'/fonts');
pm^.presetURL := PChar(projectM_Dir+'/presets');
@@ -240,7 +232,7 @@ begin
// get audio data
nSamples := AudioPlayback.GetPCMData(PcmData);
- addPCM16Data(PSmallInt(@PcmData), nSamples);
+ addPCM16Data(PPCM16Data(@PcmData), nSamples);
// store OpenGL state (might be messed up otherwise)
glPushAttrib(GL_ALL_ATTRIB_BITS);