Skip to content

Commit

Permalink
sprites work, mostly!
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Berg committed Dec 7, 2015
1 parent 4eac372 commit bf6451e
Show file tree
Hide file tree
Showing 33 changed files with 19,282 additions and 90 deletions.
157 changes: 134 additions & 23 deletions Nexys4Game/src/hdl/AV_block.v
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module AV_block(
input clk,
input clk65,
input clk130,
input pause,
input [15:0] song_time,
input [31:0] score,
Expand All @@ -21,19 +22,104 @@ module AV_block(
wire [9:0] vcount;

wire [12:0] menu_pixel;
wire blank;
wire [11:0] bg_pixel;
wire [12:0] string_pixel6, string_pixel5, string_pixel4, string_pixel3, string_pixel2, string_pixel1;

wire [9:0] paddr6, paddr5, paddr4, paddr3, paddr2, paddr1;

/////////////
// SPRITE BRAMS

// Inferred bram
reg [12:0] fret_00 [0:1023];
initial $readmemb("mif/fret_00.mif", fret_00);
reg [12:0] fret_01 [0:1023];
initial $readmemb("mif/fret_01.mif", fret_01);
reg [12:0] fret_02 [0:1023];
initial $readmemb("mif/fret_02.mif", fret_02);
reg [12:0] fret_03 [0:1023];
initial $readmemb("mif/fret_03.mif", fret_03);
reg [12:0] fret_04 [0:1023];
initial $readmemb("mif/fret_04.mif", fret_04);
reg [12:0] fret_05 [0:1023];
initial $readmemb("mif/fret_05.mif", fret_05);
reg [12:0] fret_06 [0:1023];
initial $readmemb("mif/fret_06.mif", fret_06);
reg [12:0] fret_07 [0:1023];
initial $readmemb("mif/fret_07.mif", fret_07);
reg [12:0] fret_08 [0:1023];
initial $readmemb("mif/fret_08.mif", fret_08);
reg [12:0] fret_09 [0:1023];
initial $readmemb("mif/fret_09.mif", fret_09);
reg [12:0] fret_10 [0:1023];
initial $readmemb("mif/fret_10.mif", fret_10);
reg [12:0] fret_11 [0:1023];
initial $readmemb("mif/fret_11.mif", fret_11);
reg [12:0] fret_12 [0:1023];
initial $readmemb("mif/fret_12.mif", fret_12);
reg [12:0] fret_13 [0:1023];
initial $readmemb("mif/fret_13.mif", fret_13);
reg [12:0] fret_14 [0:1023];
initial $readmemb("mif/fret_14.mif", fret_14);
reg [12:0] fret_15 [0:1023];
initial $readmemb("mif/fret_15.mif", fret_15);
reg [12:0] fret_16 [0:1023];
initial $readmemb("mif/fret_16.mif", fret_16);
reg [12:0] fret_17 [0:1023];
initial $readmemb("mif/fret_17.mif", fret_17);

wire [9:0] paddr;
assign paddr = paddr6|paddr5|paddr4|paddr3|paddr2|paddr1;
wire [13*16-1:0] pdata;
assign pdata =
{
fret_15[paddr],
fret_14[paddr],
fret_13[paddr],
fret_12[paddr],
fret_11[paddr],
fret_10[paddr],
fret_09[paddr],
fret_08[paddr],
fret_07[paddr],
fret_06[paddr],
fret_05[paddr],
fret_04[paddr],
fret_03[paddr],
fret_02[paddr],
fret_01[paddr],
fret_00[paddr]
};

//
/////////////

wire hsync,vsync,blank,pblank;
AV_sync_pipeline #(
.stages(3)
)
pipe (
.clk(clk65),
.hsync(hsync),
.vsync(vsync),
.blank(blank),

.phsync(VGA_HS),
.pvsync(VGA_VS),
.pblank(pblank)
);

xvga xvga(
.vclock(clk65),

.hcount(hcount),
.vcount(vcount),
.vsync(VGA_VS),
.hsync(VGA_HS),
.vsync(vsync),
.hsync(hsync),
.blank(blank)
);

wire [11:0] pixel_out;
AV_integrator integrator(
.clk65(clk65),
.menu_pixel(menu_pixel),
Expand All @@ -45,16 +131,17 @@ module AV_block(
.string5_pixel(13'b0),
.string6_pixel(string_pixel6),
.bg_pixel(bg_pixel),
.pixel( {4'b0, VGA_G, VGA_B} )
.pixel( pixel_out )
);

assign VGA_R = 4'b1111;
assign {VGA_R, VGA_G, VGA_B} = pblank ? 12'b0 : pixel_out;

AV_bg bg(
.clk65(clk65),
.hcount(hcount),
.vcount(vcount),
.bg_pixel(bg_pixel)
bg_display bg(
.clk(clk65),
.clk2(clk130),
.vsync(vsync),
.blank(blank),
.pixel_out(bg_pixel)
);


Expand All @@ -68,91 +155,115 @@ module AV_block(

AV_string
#(
.y_location(400)
) string6
.y_location(264)
) string6 // highest string
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[5]),
.fret(fret[29:25]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr6),
.string_pixel(string_pixel6)
);

AV_string
#(
.y_location(450)
.y_location(294)
) string5
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[4]),
.fret(fret[24:20]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr5),
.string_pixel(string_pixel5)
);

AV_string
#(
.y_location(500)
.y_location(324)
) string4
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[3]),
.fret(fret[19:15]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr4),
.string_pixel(string_pixel4)
);

AV_string
#(
.y_location(550)
.y_location(354)
) string3
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[2]),
.fret(fret[14:10]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr3),
.string_pixel(string_pixel3)
);

AV_string
#(
.y_location(600)
.y_location(384)
) string2
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[1]),
.fret(fret[9:5]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr2),
.string_pixel(string_pixel2)
);

AV_string
#(
.y_location(650)
.y_location(414)
) string1
(
.clk(clk65),
.clk65(clk65),
.clk130(clk130),
.song_time(song_time),
.match_en(fret_en[0]),
.fret(fret[4:0]),
.match_time(fret_time),
.hcount(hcount),
.vcount(vcount),
.pdata(pdata),

.paddr(paddr1),
.string_pixel(string_pixel1)
);

Expand Down
19 changes: 17 additions & 2 deletions Nexys4Game/src/hdl/AV_integrator.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,23 @@ module AV_integrator(

input [11:0] bg_pixel,

output reg [11:0] pixel
output [11:0] pixel

);

assign pixel = menu_pixel[12] ? menu_pixel[11:0] :
score_pixel[12] ? score_pixel[11:0] :
string1_pixel[12] ? string1_pixel[11:0] :
string2_pixel[12] ? string2_pixel[11:0] :
string3_pixel[12] ? string3_pixel[11:0] :
string4_pixel[12] ? string4_pixel[11:0] :
string5_pixel[12] ? string5_pixel[11:0] :
string6_pixel[12] ? string6_pixel[11:0] :
bg_pixel[11:0];


/*
always @(posedge clk65) begin //maybe make this assign and wires instead?
if( menu_pixel[12] == 1'b1 ) begin
Expand Down Expand Up @@ -45,5 +58,7 @@ module AV_integrator(
else pixel <= bg_pixel[11:0];
end

*/


endmodule
2 changes: 1 addition & 1 deletion Nexys4Game/src/hdl/AV_menu_graphics.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module AV_menu_graphics(
);

localparam WIDTH = 800;
localparam HEIGHT = 600;
localparam HEIGHT = 200;
localparam COLOR = 12'hD_D_D;
localparam startX = 100;
localparam startY = 50;
Expand Down
Loading

0 comments on commit bf6451e

Please sign in to comment.