implement flycam, traverse tree, fix bugs etc.

fix decoder, emscripten fetch, dxt crn, threading etc.

Author: retroplasma

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "client/imgui"]
-	path = client/imgui
-	url = https://github.com/ocornut/imgui
+[submodule "client/eigen"]
+	path = client/eigen
+	url = https://github.com/PX4/eigen

client/build.sh

@@ -1,10 +1,30 @@
 #!/bin/sh
-CFLAGS="--std=c++11 -g -I. `pkg-config --cflags sdl2 protobuf` -I./imgui"
-LDFLAGS="`pkg-config --libs sdl2 protobuf`"
-if [ `uname` = "Darwin" ]; then
-	LDFLAGS="$LDFLAGS -framework OpenGL"
+
+if [ "$1" == "emscripten" ]; then
+	source config_emscripten.sh
+	echo build: emscripten
+	pwd="$(pwd)" && cd .. && $EMSCRIPTEN_PROTOBUF_EXE --cpp_out=client proto/rocktree.proto && cd "$pwd"
+	cd crn && emcc -std=c++14 -c crn.cc -w && cd ..
+
+	emcc -Iinclude main.cpp -O2 -std=c++14 -I. -I./eigen/ \
+		-I$EMSCRIPTEN_PROTOBUF_SRC $EMSCRIPTEN_PROTOBUF_LIB crn/crn.o \
+		-s USE_SDL=2 -s FETCH=1 -s TOTAL_MEMORY=1073741824 -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=4 \
+		-o main.html	
 else
-	CFLAGS="$CFLAGS -Igl2/include"
-	LDFLAGS="$LDFLAGS -lGL -lm -ldl"
+	echo build: native
+	pwd="$(pwd)" && cd .. && ./makeproto.sh && cd "$pwd"
+	cd crn && g++ -std=c++14 -c crn.cc -w && cd ..
+
+	CFLAGS="--std=c++14 -g -I. `pkg-config --cflags sdl2 protobuf` -I./eigen/"
+	LDFLAGS="`pkg-config --libs sdl2 protobuf` crn/crn.o"
+	if [ `uname` = "Darwin" ]; then		
+		CFLAGS="$CFLAGS `pkg-config --cflags glew`"
+		LDFLAGS="$LDFLAGS `pkg-config --static --libs glew` -framework OpenGL"
+		echo "$CFLAGS"
+		echo "$LDFLAGS"
+	else
+		CFLAGS="$CFLAGS -Igl2/include"
+		LDFLAGS="$LDFLAGS -lGL -lm -ldl"
+	fi
+	c++ $CFLAGS main.cpp $LDFLAGS -o main
 fi
-c++ $CFLAGS main.cpp $LDFLAGS -o main

client/config_emscripten.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+EMSCRIPTEN_PROTOBUF_SRC="$(echo ~)/Downloads/protobuf/src"
+EMSCRIPTEN_PROTOBUF_LIB="$(echo ~)/Downloads/protobuf/src/.libs/libprotobuf.a"
+EMSCRIPTEN_PROTOBUF_EXE="$(echo ~)/Downloads/protoc-3.9.2-osx-x86_64/bin/protoc"

client/crn/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+g++ -c crn.cc

client/crn/crn.cc

@@ -0,0 +1,36 @@
+#include <stddef.h>
+#include <cstring>
+#include <stdint.h>
+#include "crn_decomp.h"
+
+extern "C" {
+  unsigned int crn_get_decompressed_size(const void *src, unsigned int src_size, unsigned int level_index);
+  void crn_decompress(const void *src, unsigned int src_size, void *dst, unsigned int dst_size, unsigned int level_index);
+}
+
+unsigned int crn_get_decompressed_size(const void *src, unsigned int src_size, unsigned int level_index) {
+  crnd::crn_texture_info tex_info;
+  crnd::crnd_get_texture_info(static_cast<const crn_uint8*>(src), src_size, &tex_info);
+  const crn_uint32 width = tex_info.m_width >> level_index;
+  const crn_uint32 height = tex_info.m_height >> level_index;
+  const crn_uint32 blocks_x = (width + 3) >> 2;
+  const crn_uint32 blocks_y = (height + 3) >> 2;
+  const crn_uint32 row_pitch = blocks_x * crnd::crnd_get_bytes_per_dxt_block(tex_info.m_format);
+  const crn_uint32 total_face_size = row_pitch * blocks_y;
+  return total_face_size;
+}
+
+void crn_decompress(const void *src, unsigned int src_size, void *dst, unsigned int dst_size, unsigned int level_index) {
+  crnd::crn_texture_info tex_info;
+  crnd::crnd_get_texture_info(static_cast<const crn_uint8*>(src), src_size, &tex_info);
+  const crn_uint32 width = tex_info.m_width >> level_index;
+  const crn_uint32 height = tex_info.m_height >> level_index;
+  const crn_uint32 blocks_x = (width + 3) >> 2;
+  const crn_uint32 blocks_y = (height + 3) >> 2;
+  const crn_uint32 row_pitch = blocks_x * crnd::crnd_get_bytes_per_dxt_block(tex_info.m_format);
+  crnd::crnd_unpack_context pContext = crnd::crnd_unpack_begin(static_cast<const crn_uint8*>(src), src_size);
+  void *pDecomp_images[1];
+  pDecomp_images[0] = dst;
+  crnd::crnd_unpack_level(pContext, pDecomp_images, dst_size, row_pitch, level_index);
+  crnd::crnd_unpack_end(pContext);
+}

client/crn/crn.h

@@ -0,0 +1,7 @@
+#include <stddef.h>
+#include <cstring>
+
+extern "C" {
+	unsigned int crn_get_decompressed_size(const void *src, unsigned int src_size, unsigned int level_index);
+	void crn_decompress(const void *src, unsigned int src_size, void *dst, unsigned int dst_size, unsigned int level_index);
+}