Skip to content

Commit 93059b1

Browse files
revmischarevmischa
committed
Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl
2 parents 35f3335 + 92ce639 commit 93059b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1557
-5526
lines changed

‎presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ warp_64=`pln.xw=-pln.xw;
537537
warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx;
538538
warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx;
539539
warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt;
540-
warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv;
540+
warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv;
541541
warp_69=`sp=tuv.x;
542542
warp_70=`float3 t1,t2,a1,a2;
543543
warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5);

‎presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ warp_64=`pln.xw=-pln.xw;
537537
warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx;
538538
warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx;
539539
warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt;
540-
warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv;
540+
warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv;
541541
warp_69=`sp=tuv.x;
542542
warp_70=`float3 t1,t2,a1,a2;
543543
warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5);

‎presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,8 @@ warp_146=`ret = 1-exp(-ret1*2); //finally !
743743
warp_147=`//ret = hormask;
744744
warp_148=`}
745745
warp_149=`
746-
warp_150=`written by martin
747-
warp_151=`END
746+
warp_150=`//written by martin
747+
warp_151=`//END
748748
comp_1=`shader_body
749749
comp_2=`{
750750
comp_3=`

‎presets/presets_tryptonaut/martin - fresco flash - cainlien.milk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,5 +663,5 @@ comp_55=`
663663
comp_56=`ret = 1-exp(.1-ret1) ;
664664
comp_57=`}
665665
comp_58=`
666-
comp_59=`written by martin
667-
comp_60=`END
666+
comp_59=`//written by martin
667+
comp_60=`//END

‎src/NativePresets/Makefile.am‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,11 @@ libRovastarDarkSecret_la_LDFLAGS = -avoid-version
3434
libRovastarDriftingChaos_la_LDFLAGS = -avoid-version
3535
libRovastarFractalSpiral_la_LDFLAGS = -avoid-version
3636
libRovastarFractopiaFrantic_la_LDFLAGS = -avoid-version
37+
38+
39+
libMstressJuppyDancer_la_LIBADD = ../libprojectM/libprojectM.la
40+
libRLGFractalDrop7c_la_LIBADD = ../libprojectM/libprojectM.la
41+
libRovastarDarkSecret_la_LIBADD = ../libprojectM/libprojectM.la
42+
libRovastarDriftingChaos_la_LIBADD = ../libprojectM/libprojectM.la
43+
libRovastarFractalSpiral_la_LIBADD = ../libprojectM/libprojectM.la
44+
libRovastarFractopiaFrantic_la_LIBADD = ../libprojectM/libprojectM.la

‎src/libprojectM/Renderer/Filters.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void Brighten::Draw(RenderContext &context)
2828
{
2929
glUseProgram(context.programID_v2f_c4f);
3030

31-
glUniformMatrix4fv(ShaderEngine::Uniform_V2F_C4F_VertexTranformation(), 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
31+
glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
3232

3333
glBindVertexArray(m_vaoID);
3434

@@ -61,7 +61,7 @@ void Darken::Draw(RenderContext &context)
6161
{
6262
glUseProgram(context.programID_v2f_c4f);
6363

64-
glUniformMatrix4fv(ShaderEngine::Uniform_V2F_C4F_VertexTranformation(), 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
64+
glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
6565

6666
glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0);
6767

@@ -92,7 +92,7 @@ void Invert::Draw(RenderContext &context)
9292

9393
glUseProgram(context.programID_v2f_c4f);
9494

95-
glUniformMatrix4fv(ShaderEngine::Uniform_V2F_C4F_VertexTranformation(), 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
95+
glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
9696

9797
glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0);
9898

@@ -122,7 +122,7 @@ void Solarize::Draw(RenderContext &context)
122122
{
123123
glUseProgram(context.programID_v2f_c4f);
124124

125-
glUniformMatrix4fv(ShaderEngine::Uniform_V2F_C4F_VertexTranformation(), 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
125+
glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho));
126126

127127
glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0);
128128

‎src/libprojectM/Renderer/HLSLTranslator.cpp‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/libprojectM/Renderer/HLSLTranslator.hpp‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/libprojectM/Renderer/Makefile.am‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ libRenderer_la_SOURCES = \
3838
SOIL2/pvr_helper.h SOIL2/stbi_pkm_c.h\
3939
SOIL2/stb_image.h SOIL2/stbi_pvr.h\
4040
SOIL2/stb_image_write.h SOIL2/stbi_pvr_c.h\
41-
hlslparser/src/CodeWriter.cpp hlslparser/src/Engine.h hlslparser/src/HLSLGenerator.cpp \
42-
hlslparser/src/HLSLParser.h hlslparser/src/HLSLTree.cpp hlslparser/src/MSLGenerator.h \
43-
hlslparser/src/CodeWriter.h hlslparser/src/GLSLGenerator.cpp hlslparser/src/HLSLGenerator.h \
41+
hlslparser/src/CodeWriter.cpp hlslparser/src/Engine.h \
42+
hlslparser/src/HLSLParser.h hlslparser/src/HLSLTree.cpp \
43+
hlslparser/src/CodeWriter.h hlslparser/src/GLSLGenerator.cpp \
4444
hlslparser/src/HLSLTokenizer.cpp hlslparser/src/HLSLTree.h \
4545
hlslparser/src/Engine.cpp hlslparser/src/GLSLGenerator.h hlslparser/src/HLSLParser.cpp \
46-
hlslparser/src/HLSLTokenizer.h hlslparser/src/MSLGenerator.cpp \
47-
HLSLTranslator.cpp HLSLTranslator.hpp
46+
hlslparser/src/HLSLTokenizer.h
4847

4948
libRenderer_la_CPPFLAGS = ${my_CFLAGS} \
5049
-include $(top_builddir)/config.h \

‎src/libprojectM/Renderer/MilkdropWaveform.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void MilkdropWaveform::Draw(RenderContext &context)
7373
mat_vertex = mat_scale * mat_vertex;
7474
mat_vertex = mat_rotation * mat_vertex;
7575
mat_vertex = mat_second_translation * mat_vertex;
76-
glUniformMatrix4fv(ShaderEngine::Uniform_V2F_C4F_VertexTranformation(), 1, GL_FALSE, glm::value_ptr(mat_vertex));
76+
glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(mat_vertex));
7777

7878
if(modulateAlphaByVolume) ModulateOpacityByVolume(context);
7979
else temp_a = a;

0 commit comments

Comments
 (0)