Skip to content

Commit 6cd45f7

Browse files
committedJan 14, 2012
Merge branch 'symtab'
2 parents 6bc121b + 7496b45 commit 6cd45f7

Some content is hidden

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

47 files changed

+1742
-1395
lines changed
 

‎patches/Unchained - A Matter Of Taste (Remix).fnp

+8-7
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ ib_r=0.250000
3838
ib_g=0.250000
3939
ib_b=0.250000
4040
ib_a=0.000000
41-
per_frame=pulse=above(bass,0.7)//if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01);
42-
per_frame=q1=mid_residual;
43-
per_frame=q2=bass_residual;
44-
per_frame=q3=treb_residual;
41+
per_frame=pulse=above(bass,0.7);
42+
//if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01);
43+
//per_frame=q1=mid_residual;
44+
//per_frame=q2=bass_residual;
45+
//per_frame=q3=treb_residual;
4546
per_frame=q4=sin(pulse);
4647
per_frame=q5=cos(pulse);
4748
per_frame=wave_mystery=-.2+.2*q4;
48-
per_frame=wave_r=wave_r+.5*bass_residual;
49-
per_frame=wave_r=wave_g+.5*mid_residual;
50-
per_frame=wave_r=wave_b+.5*treb_residual;
49+
//per_frame=wave_r=wave_r+.5*bass_residual;
50+
//per_frame=wave_r=wave_g+.5*mid_residual;
51+
//per_frame=wave_r=wave_b+.5*treb_residual;
5152
per_frame=zoom=zoom-.0035*q1;
5253
per_frame=decay=decay+.003*sin(pulse);
5354
per_vertex=anti_rad=(1-rad);

‎src/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ endif
3434

3535
CFLAGS = -O9 -Wall -Wstrict-prototypes -Wmissing-prototypes \
3636
-Wold-style-declaration -Wold-style-definition \
37+
-Wno-char-subscripts \
3738
-mbarrel-shift-enabled -mmultiply-enabled \
3839
-mdivide-enabled -msign-extend-enabled -fsingle-precision-constant \
3940
-I$(RTEMS_MAKEFILE_PATH)/lib/include -g
@@ -63,7 +64,7 @@ OBJS += $(addprefix renderer/,framedescriptor.o analyzer.o sampler.o \
6364
eval.o line.o wave.o font.o osd.o raster.o renderer.o \
6465
videoinreconf.o)
6566
OBJS += $(addprefix compiler/,compiler.o parser_helper.o scanner.o \
66-
parser.o unique.o)
67+
parser.o symtab.o)
6768

6869
POBJS=$(addprefix $(OBJDIR)/,$(OBJS))
6970

@@ -99,7 +100,7 @@ compiler/infra-fnp.h: \
99100
compiler/parser.h: compiler/parser.c
100101
obj/compiler/scanner.o: compiler/parser.h
101102
obj/compiler/parser_helper.o: compiler/parser.h
102-
obj/compiler/unique.o: compiler/fnp.inc
103+
obj/compiler/symtab.o: compiler/fnp.inc
103104
obj/compiler/compiler.o: compiler/infra-fnp.h compiler/parser.h
104105

105106
# boot images for Milkymist One

0 commit comments

Comments
 (0)
Please sign in to comment.