Embedded mongoose
This commit is contained in:
parent
8ccb4694ef
commit
63005396d6
17
Makefile
17
Makefile
|
@ -1,6 +1,6 @@
|
|||
CFLAGS +=
|
||||
LDFLAGS := -lm
|
||||
OBJECTS := obj/obcb.o
|
||||
OBJECTS := obj/obcb.o obj/mongoose.o
|
||||
|
||||
all: obcb obcb-nbd.so live
|
||||
|
||||
|
@ -17,27 +17,30 @@ bot-run: bot
|
|||
./bot
|
||||
|
||||
bot: ./src/bot.c $(OBJECTS)
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/bot.c $(LDFLAGS) -o bot -lmongoose -lraylib -lm
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/bot.c $(LDFLAGS) -o bot -lraylib -lm
|
||||
|
||||
live: ./src/live.c $(OBJECTS)
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/live.c $(LDFLAGS) -o live -lmongoose -lraylib -lm
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/live.c $(LDFLAGS) -o live -lraylib -lm
|
||||
|
||||
live-1chunk: ./src/live-1chunk.c $(OBJECTS)
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/live-1chunk.c $(LDFLAGS) -o live-1chunk -lmongoose -lraylib -lm
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/live-1chunk.c $(LDFLAGS) -o live-1chunk -lraylib -lm
|
||||
|
||||
obcb: lib $(OBJECTS)
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/main.c $(LDFLAGS) -o obcb -lmongoose
|
||||
$(CC) $(CFLAGS) $(OBJECTS) src/main.c $(LDFLAGS) -o obcb
|
||||
|
||||
nbd: obcb-nbd.so
|
||||
nbdkit --filter=blocksize-policy -fv ./obcb-nbd.so blocksize-error-policy=error
|
||||
|
||||
obcb-nbd.so: src/obcb-nbd.c $(OBJECTS)
|
||||
$(CC) $(CFLAGS) $(OBJECTS) -fPIC -shared src/obcb-nbd.c -o obcb-nbd.so -lmongoose `pkg-config nbdkit --cflags --libs`
|
||||
$(CC) $(CFLAGS) $(OBJECTS) -fPIC -shared src/obcb-nbd.c -o obcb-nbd.so `pkg-config nbdkit --cflags --libs`
|
||||
|
||||
lib: $(OBJECTS)
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJECTS) obcb
|
||||
$(RM) $(OBJECTS) obcb ./live ./live-1chunk ./bot
|
||||
|
||||
obj/%.o: src/%.c
|
||||
$(CC) $(CFLAGS) -c $^ -o $@
|
||||
|
||||
obj/mongoose.o: src/mongoose.c
|
||||
$(CC) $(CFLAGS) -c $^ -fPIC -o $@
|
||||
|
|
BIN
chunk420.data
BIN
chunk420.data
Binary file not shown.
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 256 KiB |
|
@ -125,7 +125,7 @@ int render_thread(void *_conn) {
|
|||
|
||||
int failure = 0;
|
||||
for (int i = (rand() % OBCB_CHUNK_SIZE); true; i = (i + 1) % OBCB_CHUNK_SIZE) {
|
||||
#if 1
|
||||
#if 0
|
||||
int blk_index = i / 256;
|
||||
int blk_pos = shuffle[i % 256];
|
||||
int ox = blk_pos & 15, oy = blk_pos >> 4;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include <threads.h>
|
||||
#include "obcb.h"
|
||||
|
||||
#define WAITING_QUEUE_SIZE 32
|
||||
#define WAITING_QUEUE_SIZE 48
|
||||
|
||||
static uint32_t connected_clients = 0;
|
||||
static bool running = true;
|
||||
|
@ -189,7 +189,7 @@ int main(void) {
|
|||
.zoom = 0.125
|
||||
};
|
||||
|
||||
double zoom = 0.5;
|
||||
double zoom = 1.0;
|
||||
|
||||
int req_chunk = 0;
|
||||
for (unsigned long frame = 0; !WindowShouldClose(); frame++) {
|
||||
|
@ -278,7 +278,7 @@ int main(void) {
|
|||
for (int cy = 0; cy < 64; cy++) {
|
||||
for (int cx = 0; cx < 64; cx++) {
|
||||
double since_last_update = current_time - chunks[cx + cy * 64].last_update;
|
||||
DrawRectangle(cx * 2, cy * 2 + 128, 2, 2, (Color){
|
||||
DrawRectangle(cx * 2, cy * 2, 2, 2, (Color){
|
||||
.r = 255 * Clamp((5.0 - since_last_update) / 5.0, 0.0, 1.0),
|
||||
.g = 0,
|
||||
.b = chunks[cx + cy * 64].waiting ? 255 : 0,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue