CI and common update:
-added webpage deploymnet stage -added separate build stage which build all binaries and generate documentation -added Emscripten build stage for merge to master only -added VBO batch rendering (current default, no render mode switch yet) -fixed camera positioning calculation -fixed buffer issue with WebGL -added viewport scalling (at least 300 pixels height). Pixels are scalled if screen is bigger. -center demos gameplay area -added fullpage html template for Emscripten build
This commit is contained in:
parent
f67eb452cc
commit
54a6d5dec2
29 changed files with 1167 additions and 322 deletions
2
demos/.gitignore
vendored
2
demos/.gitignore
vendored
|
|
@ -12,4 +12,6 @@
|
|||
!.gitignore
|
||||
!compile_wasm.py
|
||||
!cimgui.bc
|
||||
!emscripten_shell.html
|
||||
!emscripten_multi_shell.html
|
||||
.dub
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 24 KiB |
|
|
@ -1,6 +1,7 @@
|
|||
import os
|
||||
import ntpath
|
||||
import sys
|
||||
import imp
|
||||
|
||||
def compile(sources, output):
|
||||
files = []
|
||||
|
|
@ -36,8 +37,10 @@ compiler = 'ldc2 '
|
|||
shared_flags = ''
|
||||
clean = 0
|
||||
demo = 0
|
||||
only_bc = 0
|
||||
multi = 0
|
||||
sources = ['tests', 'source']
|
||||
emc_flags = '-s USE_SDL=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS="[\'png\']" --preload-file assets '
|
||||
emc_flags = '-s USE_SDL=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS="[\'png\']" '
|
||||
ldc_flags = '--d-version=ECSEmscripten --d-version=SDL_209 --d-version=BindSDL_Static --d-version=BindSDL_Image --d-version=MM_USE_POSIX_THREADS '
|
||||
import_paths = ['external/sources', 'external/imports', 'external/wasm_imports', '../source', 'utils/source', 'simple/source']
|
||||
|
||||
|
|
@ -60,6 +63,8 @@ for arg in sys.argv[1:]:
|
|||
shared_flags += '-Oz '
|
||||
elif(arg == '-g'):
|
||||
shared_flags += '-g '
|
||||
elif(arg == '--multi'):
|
||||
multi = 1
|
||||
elif(arg == '-g4'):
|
||||
ldc_flags += '-g '
|
||||
emc_flags += '-g4 --source-map-base ./ '
|
||||
|
|
@ -79,6 +84,8 @@ for arg in sys.argv[1:]:
|
|||
emc_flags += '-s USE_PTHREADS=1 '
|
||||
elif(arg == '--demo=simple'):
|
||||
demo = 0
|
||||
elif(arg == '--only-bc'):
|
||||
only_bc = 1
|
||||
else:
|
||||
print('unknown argument: ' + arg)
|
||||
exit()
|
||||
|
|
@ -92,8 +99,17 @@ compile(['source'], 'demo.bc')
|
|||
if clean or os.path.exists('../ecs.bc') == 0 or os.path.isfile('../ecs.bc') == 0:
|
||||
compile(['../source'], '../ecs.bc')
|
||||
|
||||
emcc_cmd = 'emcc -v ' + shared_flags + emc_flags + '-s ERROR_ON_UNDEFINED_SYMBOLS=0 -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 -s ALLOW_MEMORY_GROWTH=1 -s MINIFY_HTML=0 -s WASM_MEM_MAX=2048MB -s MALLOC=dlmalloc -s WASM=1 -o ecs_demo.html '
|
||||
if only_bc:
|
||||
exit()
|
||||
|
||||
if multi:
|
||||
emcc_cmd = 'emcc ' + shared_flags + emc_flags + '--pre-js build/assets.js -s FORCE_FILESYSTEM=1 -s MAX_WEBGL_VERSION=2 --emrun -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 -s ALLOW_MEMORY_GROWTH=1 -s WASM_MEM_MAX=2048MB -s MALLOC=dlmalloc -s WASM=1 {0} -o {1} --shell-file emscripten_multi_shell.html '
|
||||
else:
|
||||
emcc_cmd = 'emcc ' + shared_flags + emc_flags + '--pre-js build/assets.js -s FORCE_FILESYSTEM=1 -s MAX_WEBGL_VERSION=2 --emrun -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 -s ALLOW_MEMORY_GROWTH=1 -s WASM_MEM_MAX=2048MB -s MALLOC=dlmalloc -s WASM=1 -o build/ecs_demo.html --shell-file emscripten_shell.html '
|
||||
|
||||
#emcc_cmd = 'emcc -v ' + shared_flags + emc_flags + '-s MAX_WEBGL_VERSION=2 --emrun -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 -s ALLOW_MEMORY_GROWTH=1 -s WASM_MEM_MAX=2048MB -s MALLOC=dlmalloc -s WASM=1 -o build/ecs_demo.html --shell-file emscripten_shell.html '
|
||||
#-s ALLOW_MEMORY_GROWTH=1 -s PROXY_TO_PTHREAD=1 -Wl,--no-check-features -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s TOTAL_MEMORY=512MB
|
||||
#-s MAX_WEBGL_VERSION=2
|
||||
|
||||
emcc_cmd += '../ecs.bc '
|
||||
emcc_cmd += 'utils.bc '
|
||||
|
|
@ -103,6 +119,24 @@ emcc_cmd += 'cimgui.bc '
|
|||
emcc_cmd += 'mmutils.bc '
|
||||
emcc_cmd += 'demo.bc '
|
||||
|
||||
print(emcc_cmd)
|
||||
os.system("mkdir build")
|
||||
|
||||
emscripten = imp.load_source('', os.path.expanduser("~") + '/.emscripten')
|
||||
pack_cmd = emscripten.EMSCRIPTEN_ROOT + '/tools/file_packager.py build/assets.data --preload assets --js-output=build/assets.js'
|
||||
print('Packafing files: ' + pack_cmd)
|
||||
|
||||
os.system(pack_cmd)
|
||||
|
||||
if multi:
|
||||
final_cmd = emcc_cmd.format('','build/ecs_demo.html')
|
||||
print(final_cmd)
|
||||
os.system(final_cmd)
|
||||
final_cmd = emcc_cmd.format('-s USE_PTHREADS=1','build/ecs_demo_mt.js')
|
||||
print(final_cmd)
|
||||
os.system(final_cmd)
|
||||
else:
|
||||
print(emcc_cmd)
|
||||
os.system(emcc_cmd)
|
||||
|
||||
os.system('rm build/assets.js')
|
||||
|
||||
os.system(emcc_cmd)
|
||||
|
|
|
|||
170
demos/emscripten_multi_shell.html
Normal file
170
demos/emscripten_multi_shell.html
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
<!doctype html>
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>ECS Demo</title>
|
||||
<style>
|
||||
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
||||
textarea.emscripten { font-family: monospace; width: 80%; }
|
||||
div.emscripten { text-align: center; }
|
||||
div.emscripten_border { border: 1px solid black; }
|
||||
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
||||
canvas.emscripten { position: absolute;top: 0px;left: 0px;margin: 0px; border: 0px none; background-color: black; width: 100%; height: 100%; overflow: hidden;}
|
||||
|
||||
.spinner {
|
||||
height: 50px;
|
||||
width: 50px;
|
||||
margin: 0px auto;
|
||||
-webkit-animation: rotation .8s linear infinite;
|
||||
-moz-animation: rotation .8s linear infinite;
|
||||
-o-animation: rotation .8s linear infinite;
|
||||
animation: rotation 0.8s linear infinite;
|
||||
border-left: 10px solid rgb(0,150,240);
|
||||
border-right: 10px solid rgb(0,150,240);
|
||||
border-bottom: 10px solid rgb(0,150,240);
|
||||
border-top: 10px solid rgb(100,0,200);
|
||||
border-radius: 100%;
|
||||
background-color: rgb(200,100,250);
|
||||
}
|
||||
@-webkit-keyframes rotation {
|
||||
from {-webkit-transform: rotate(0deg);}
|
||||
to {-webkit-transform: rotate(360deg);}
|
||||
}
|
||||
@-moz-keyframes rotation {
|
||||
from {-moz-transform: rotate(0deg);}
|
||||
to {-moz-transform: rotate(360deg);}
|
||||
}
|
||||
@-o-keyframes rotation {
|
||||
from {-o-transform: rotate(0deg);}
|
||||
to {-o-transform: rotate(360deg);}
|
||||
}
|
||||
@keyframes rotation {
|
||||
from {transform: rotate(0deg);}
|
||||
to {transform: rotate(360deg);}
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!--<hr/>-->
|
||||
<figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
|
||||
<div class="emscripten" id="status">Downloading...</div>
|
||||
<div class="emscripten">
|
||||
<progress value="0" max="100" id="progress" hidden=1></progress>
|
||||
</div>
|
||||
<div class="emscripten_border">
|
||||
<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
|
||||
</div>
|
||||
<!--<hr/>
|
||||
<div class="emscripten">
|
||||
<input type="checkbox" id="resize">Resize canvas
|
||||
<input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
|
||||
|
||||
<input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
|
||||
document.getElementById('resize').checked)">
|
||||
</div>-->
|
||||
|
||||
<hr/>
|
||||
<textarea class="emscripten" id="output" rows="8"></textarea>
|
||||
<hr>
|
||||
<script type='text/javascript'>
|
||||
var statusElement = document.getElementById('status');
|
||||
var progressElement = document.getElementById('progress');
|
||||
var spinnerElement = document.getElementById('spinner');
|
||||
var canvasElement = document.getElementById('canvas');
|
||||
canvasElement.style.display = "none";
|
||||
|
||||
var Module = {
|
||||
preRun: [],
|
||||
postRun: [],
|
||||
print: (function() {
|
||||
var element = document.getElementById('output');
|
||||
if (element) element.value = ''; // clear browser cache
|
||||
return function(text) {
|
||||
if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
|
||||
// These replacements are necessary if you render to raw HTML
|
||||
//text = text.replace(/&/g, "&");
|
||||
//text = text.replace(/</g, "<");
|
||||
//text = text.replace(/>/g, ">");
|
||||
//text = text.replace('\n', '<br>', 'g');
|
||||
console.log(text);
|
||||
if (element) {
|
||||
element.value += text + "\n";
|
||||
element.scrollTop = element.scrollHeight; // focus on bottom
|
||||
}
|
||||
};
|
||||
})(),
|
||||
printErr: function(text) {
|
||||
if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
|
||||
console.error(text);
|
||||
},
|
||||
canvas: (function() {
|
||||
var canvas = document.getElementById('canvas');
|
||||
|
||||
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
|
||||
// application robust, you may want to override this behavior before shipping!
|
||||
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
|
||||
canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
|
||||
|
||||
return canvas;
|
||||
})(),
|
||||
setStatus: function(text) {
|
||||
if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' };
|
||||
if (text === Module.setStatus.last.text) return;
|
||||
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
|
||||
var now = Date.now();
|
||||
if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
|
||||
Module.setStatus.last.time = now;
|
||||
Module.setStatus.last.text = text;
|
||||
|
||||
if (m) {
|
||||
text = m[1];
|
||||
progressElement.value = parseInt(m[2])*100;
|
||||
progressElement.max = parseInt(m[4])*100;
|
||||
progressElement.hidden = false;
|
||||
spinnerElement.hidden = false;
|
||||
} else {
|
||||
progressElement.value = null;
|
||||
progressElement.max = null;
|
||||
progressElement.hidden = true;
|
||||
if (!text) spinnerElement.hidden = true;
|
||||
}
|
||||
statusElement.innerHTML = text;
|
||||
},
|
||||
totalDependencies: 0,
|
||||
monitorRunDependencies: function(left) {
|
||||
this.totalDependencies = Math.max(this.totalDependencies, left);
|
||||
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
||||
if (!left) canvasElement.style.display = "block";
|
||||
}
|
||||
};
|
||||
Module.setStatus('Downloading...');
|
||||
window.onerror = function() {
|
||||
canvasElement.style.display = "none";
|
||||
Module.setStatus('Exception thrown, see JavaScript console');
|
||||
spinnerElement.style.display = 'none';
|
||||
Module.setStatus = function(text) {
|
||||
if (text) Module.printErr('[post-exception status] ' + text);
|
||||
};
|
||||
};
|
||||
(function() {
|
||||
if(typeof SharedArrayBuffer !== "undefined")
|
||||
{
|
||||
memory_test = new WebAssembly.Memory({
|
||||
"initial": 1,
|
||||
"maximum": 1,
|
||||
"shared": true
|
||||
});
|
||||
|
||||
if (!(memory_test.buffer instanceof SharedArrayBuffer))src = "ecs_demo.js";
|
||||
else src = "ecs_demo_mt.js";
|
||||
delete memory_test;
|
||||
}
|
||||
else src = "ecs_demo.js";
|
||||
document.write('<script async type="text/javascript" src="' + src + '"><\/script>');
|
||||
})();
|
||||
</script>
|
||||
<!--{{{ SCRIPT }}}-->
|
||||
</body>
|
||||
</html>
|
||||
154
demos/emscripten_shell.html
Normal file
154
demos/emscripten_shell.html
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
<!doctype html>
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>ECS Demo</title>
|
||||
<style>
|
||||
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
||||
textarea.emscripten { font-family: monospace; width: 80%; }
|
||||
div.emscripten { text-align: center; }
|
||||
div.emscripten_border { border: 1px solid black; }
|
||||
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
||||
canvas.emscripten { position: absolute;top: 0px;left: 0px;margin: 0px; border: 0px none; background-color: black; width: 100%; height: 100%; overflow: hidden;}
|
||||
|
||||
.spinner {
|
||||
height: 50px;
|
||||
width: 50px;
|
||||
margin: 0px auto;
|
||||
-webkit-animation: rotation .8s linear infinite;
|
||||
-moz-animation: rotation .8s linear infinite;
|
||||
-o-animation: rotation .8s linear infinite;
|
||||
animation: rotation 0.8s linear infinite;
|
||||
border-left: 10px solid rgb(0,150,240);
|
||||
border-right: 10px solid rgb(0,150,240);
|
||||
border-bottom: 10px solid rgb(0,150,240);
|
||||
border-top: 10px solid rgb(100,0,200);
|
||||
border-radius: 100%;
|
||||
background-color: rgb(200,100,250);
|
||||
}
|
||||
@-webkit-keyframes rotation {
|
||||
from {-webkit-transform: rotate(0deg);}
|
||||
to {-webkit-transform: rotate(360deg);}
|
||||
}
|
||||
@-moz-keyframes rotation {
|
||||
from {-moz-transform: rotate(0deg);}
|
||||
to {-moz-transform: rotate(360deg);}
|
||||
}
|
||||
@-o-keyframes rotation {
|
||||
from {-o-transform: rotate(0deg);}
|
||||
to {-o-transform: rotate(360deg);}
|
||||
}
|
||||
@keyframes rotation {
|
||||
from {transform: rotate(0deg);}
|
||||
to {transform: rotate(360deg);}
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!--<hr/>-->
|
||||
<figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
|
||||
<div class="emscripten" id="status">Downloading...</div>
|
||||
<div class="emscripten">
|
||||
<progress value="0" max="100" id="progress" hidden=1></progress>
|
||||
</div>
|
||||
<div class="emscripten_border">
|
||||
<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
|
||||
</div>
|
||||
<!--<hr/>
|
||||
<div class="emscripten">
|
||||
<input type="checkbox" id="resize">Resize canvas
|
||||
<input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
|
||||
|
||||
<input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
|
||||
document.getElementById('resize').checked)">
|
||||
</div>-->
|
||||
|
||||
<hr/>
|
||||
<textarea class="emscripten" id="output" rows="8"></textarea>
|
||||
<hr>
|
||||
<script type='text/javascript'>
|
||||
var statusElement = document.getElementById('status');
|
||||
var progressElement = document.getElementById('progress');
|
||||
var spinnerElement = document.getElementById('spinner');
|
||||
var canvasElement = document.getElementById('canvas');
|
||||
canvasElement.style.display = "none";
|
||||
|
||||
var Module = {
|
||||
preRun: [],
|
||||
postRun: [],
|
||||
print: (function() {
|
||||
var element = document.getElementById('output');
|
||||
if (element) element.value = ''; // clear browser cache
|
||||
return function(text) {
|
||||
if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
|
||||
// These replacements are necessary if you render to raw HTML
|
||||
//text = text.replace(/&/g, "&");
|
||||
//text = text.replace(/</g, "<");
|
||||
//text = text.replace(/>/g, ">");
|
||||
//text = text.replace('\n', '<br>', 'g');
|
||||
console.log(text);
|
||||
if (element) {
|
||||
element.value += text + "\n";
|
||||
element.scrollTop = element.scrollHeight; // focus on bottom
|
||||
}
|
||||
};
|
||||
})(),
|
||||
printErr: function(text) {
|
||||
if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
|
||||
console.error(text);
|
||||
},
|
||||
canvas: (function() {
|
||||
var canvas = document.getElementById('canvas');
|
||||
|
||||
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
|
||||
// application robust, you may want to override this behavior before shipping!
|
||||
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
|
||||
canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
|
||||
|
||||
return canvas;
|
||||
})(),
|
||||
setStatus: function(text) {
|
||||
if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' };
|
||||
if (text === Module.setStatus.last.text) return;
|
||||
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
|
||||
var now = Date.now();
|
||||
if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
|
||||
Module.setStatus.last.time = now;
|
||||
Module.setStatus.last.text = text;
|
||||
|
||||
if (m) {
|
||||
text = m[1];
|
||||
progressElement.value = parseInt(m[2])*100;
|
||||
progressElement.max = parseInt(m[4])*100;
|
||||
progressElement.hidden = false;
|
||||
spinnerElement.hidden = false;
|
||||
} else {
|
||||
progressElement.value = null;
|
||||
progressElement.max = null;
|
||||
progressElement.hidden = true;
|
||||
if (!text) spinnerElement.hidden = true;
|
||||
}
|
||||
statusElement.innerHTML = text;
|
||||
},
|
||||
totalDependencies: 0,
|
||||
monitorRunDependencies: function(left) {
|
||||
this.totalDependencies = Math.max(this.totalDependencies, left);
|
||||
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
||||
if (!left) canvasElement.style.display = "block";
|
||||
}
|
||||
};
|
||||
Module.setStatus('Downloading...');
|
||||
window.onerror = function() {
|
||||
canvasElement.style.display = "none";
|
||||
Module.setStatus('Exception thrown, see JavaScript console');
|
||||
spinnerElement.style.display = 'none';
|
||||
Module.setStatus = function(text) {
|
||||
if (text) Module.printErr('[post-exception status] ' + text);
|
||||
};
|
||||
};
|
||||
</script>
|
||||
{{{ SCRIPT }}}
|
||||
</body>
|
||||
</html>
|
||||
10
demos/external/sources/mmutils/thread_pool.d
vendored
10
demos/external/sources/mmutils/thread_pool.d
vendored
|
|
@ -12,6 +12,8 @@ import std.algorithm : map;
|
|||
version = MM_NO_LOGS; // Disable log creation
|
||||
//version = MM_USE_POSIX_THREADS; // Use posix threads insted of standard library, required for betterC
|
||||
|
||||
version (Posix)version = MM_USE_POSIX_THREADS;
|
||||
|
||||
version (WebAssembly)
|
||||
{
|
||||
extern(C) struct FILE
|
||||
|
|
@ -374,7 +376,8 @@ version (MM_USE_POSIX_THREADS)
|
|||
{
|
||||
threadStart = dg;
|
||||
int ok = pthread_create(&handle, null, &threadRunFunc, cast(void*)&this);
|
||||
assert(ok == 0);
|
||||
if(!ok)handle = pthread_t();
|
||||
//assert(ok == 0);
|
||||
}
|
||||
|
||||
void join()
|
||||
|
|
@ -459,7 +462,8 @@ else version(D_BetterC)
|
|||
{
|
||||
threadStart = dg;
|
||||
int ok = pthread_create(&handle, null, &threadRunFunc, cast(void*)&this);
|
||||
assert(ok == 0);
|
||||
if(!ok)handle = pthread_t();
|
||||
//assert(ok == 0);
|
||||
}
|
||||
|
||||
void join()
|
||||
|
|
@ -567,7 +571,7 @@ else version(D_BetterC)
|
|||
threadStart = dg;
|
||||
handle = cast(HANDLE) _beginthreadex( null, 0, &threadRunFunc, cast(void*)&this, 0, null );
|
||||
//int ok = pthread_create(&handle, null, &threadRunFunc, cast(void*)&this);
|
||||
assert(handle != null);
|
||||
//assert(handle != null);
|
||||
}
|
||||
|
||||
void join()
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ struct Launcher
|
|||
void function() end;
|
||||
void function(SDL_Event*) event;
|
||||
void function(vec2, Tool, int) tool;
|
||||
float scalling;
|
||||
ivec2 window_size = ivec2(1024,768);
|
||||
Renderer renderer;
|
||||
ubyte[] keys;
|
||||
|
|
@ -60,6 +61,7 @@ struct Launcher
|
|||
ulong timer_freq;
|
||||
double delta_time;
|
||||
uint fps;
|
||||
vec2 render_position;
|
||||
|
||||
Tool used_tool;
|
||||
int tool_size = 0;
|
||||
|
|
@ -229,7 +231,7 @@ void mainLoop(void* arg)
|
|||
}
|
||||
if(launcher.tool && event.button.button == SDL_BUTTON_LEFT && launcher.tool_repeat == 0 && !igIsWindowHovered(ImGuiHoveredFlags_AnyWindow))
|
||||
{
|
||||
launcher.tool(vec2(event.button.x, launcher.window_size.y - event.button.y), launcher.used_tool, launcher.tool_size);
|
||||
launcher.tool(vec2(event.button.x, launcher.window_size.y - event.button.y) * launcher.scalling - launcher.render_position, launcher.used_tool, launcher.tool_size);
|
||||
}
|
||||
}
|
||||
else if(event.type == SDL_MOUSEBUTTONUP)
|
||||
|
|
@ -255,7 +257,7 @@ void mainLoop(void* arg)
|
|||
while(launcher.repeat_time > range)
|
||||
{
|
||||
launcher.repeat_time -= range;
|
||||
launcher.tool(launcher.mouse.position, launcher.used_tool, launcher.tool_size);
|
||||
launcher.tool((launcher.mouse.position*launcher.scalling)-launcher.render_position, launcher.used_tool, launcher.tool_size);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -525,7 +527,14 @@ void mainLoop(void* arg)
|
|||
}
|
||||
|
||||
launcher.renderer.resize(launcher.window_size);
|
||||
launcher.renderer.view(vec2(0,0),vec2(launcher.window_size.x,launcher.window_size.y));
|
||||
//launcher.renderer.view(vec2(0,0),vec2(launcher.window_size.x,launcher.window_size.y));
|
||||
//if(384, 768, 1152, 1536)
|
||||
//576 960 1344 1728
|
||||
//float scalling;
|
||||
if(launcher.window_size.y < 360)launcher.scalling = 1;
|
||||
else launcher.scalling = 1.0 / ((launcher.window_size.y+120)/360);
|
||||
launcher.renderer.view(launcher.render_position,vec2(launcher.window_size.x,launcher.window_size.y)*launcher.scalling);
|
||||
//launcher.renderer.view(vec2(0,0),vec2(1024*launcher.window_size.x/launcher.window_size.y,768));
|
||||
//glClear(GL_COLOR_BUFFER_BIT);
|
||||
launcher.renderer.clear();
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ struct DrawSystem
|
|||
{
|
||||
foreach(i; 0..data.length)
|
||||
{
|
||||
launcher.renderer.draw(data.textures[i].tex, data.locations[i].location, vec2(32,32), vec4(0,0,1,1), 0, 0 , 0);
|
||||
launcher.renderer.draw(data.textures[i].tex, data.locations[i].location, vec2(16,16), vec4(0,0,1,1), 0, 0 , 0);
|
||||
//draw(renderer, data.textures[i].tex, data.locations[i], vec2(32,32), vec4(0,0,1,1));
|
||||
}
|
||||
}
|
||||
|
|
@ -81,7 +81,7 @@ struct MoveSystem
|
|||
foreach(i; 0..data.length)
|
||||
{
|
||||
data.locations[i].location.y = data.locations[i].location.y + 1;
|
||||
if(data.locations[i].location.y > 400)data.locations[i].location.y = 0;
|
||||
if(data.locations[i].location.y > 300)data.locations[i].location.y = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -119,7 +119,7 @@ void simpleStart()
|
|||
foreach(i; 0..10)
|
||||
foreach(j; 0..10)
|
||||
{
|
||||
loc_comp.location = vec2(i*32+64,j*32+64);
|
||||
loc_comp.location = vec2(i*16+64,j*16+64);
|
||||
launcher.manager.addEntity(simple.tmpl);
|
||||
}
|
||||
}
|
||||
|
|
@ -147,6 +147,10 @@ void simpleTool(vec2 position, Tool tool, int size)
|
|||
{
|
||||
position.x += (randomf - 0.5) * size;
|
||||
position.y += (randomf - 0.5) * size;
|
||||
if(position.x > 400)position.x -= 400;
|
||||
else if(position.x < 0)position.x += 400;
|
||||
if(position.y > 300)position.y -= 300;
|
||||
else if(position.y < 0)position.y += 300;
|
||||
*location = position;
|
||||
}
|
||||
launcher.manager.addEntity(tmpl);
|
||||
|
|
@ -169,17 +173,18 @@ void simpleEvent(SDL_Event* event)
|
|||
void spawnEntity()
|
||||
{
|
||||
CLocation* loc_comp = simple.tmpl.getComponent!CLocation;
|
||||
loc_comp.location = vec2(randomf() * 600,0);
|
||||
loc_comp.location = vec2(randomf() * 400,0);
|
||||
launcher.manager.addEntity(simple.tmpl);
|
||||
}
|
||||
|
||||
bool simpleLoop()
|
||||
{
|
||||
launcher.render_position = (vec2(launcher.window_size.x,launcher.window_size.y)*launcher.scalling - vec2(400,300)) * 0.5;
|
||||
|
||||
if(launcher.getKeyState(SDL_SCANCODE_SPACE))
|
||||
{
|
||||
foreach(i;0..1)spawnEntity();
|
||||
}
|
||||
|
||||
|
||||
launcher.manager.begin();
|
||||
if(launcher.multithreading)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@ import ecs_utils.gfx.texture;
|
|||
import ecs_utils.math.vector;
|
||||
import ecs_utils.utils;
|
||||
|
||||
import std.array : staticArray;
|
||||
|
||||
enum float px = 1.0/512.0;
|
||||
|
||||
extern(C):
|
||||
|
||||
struct MapElement
|
||||
|
|
@ -24,9 +28,24 @@ struct MapElement
|
|||
enum Type
|
||||
{
|
||||
empty = 0,
|
||||
snake = 1,
|
||||
apple = 2,
|
||||
wall = 3
|
||||
apple = 1,
|
||||
wall = 2,
|
||||
|
||||
snake_head_up = 5,
|
||||
snake_head_down = 6,
|
||||
snake_head_left = 7,
|
||||
snake_head_right = 8,
|
||||
snake_tail_up = 9,
|
||||
snake_tail_down = 10,
|
||||
snake_tail_left = 11,
|
||||
snake_tail_right = 12,
|
||||
snake_turn_ld = 13,
|
||||
snake_turn_lu = 14,
|
||||
snake_turn_rd = 15,
|
||||
snake_turn_ru = 16,
|
||||
snake_vertical = 17,
|
||||
snake_horizontal = 18
|
||||
|
||||
}
|
||||
Type type;
|
||||
EntityID id;
|
||||
|
|
@ -38,8 +57,13 @@ struct Snake
|
|||
|
||||
EntityTemplate* apple_tmpl;
|
||||
EntityTemplate* snake_tmpl;
|
||||
EntityTemplate* snake_destroy_particle;
|
||||
Texture texture;
|
||||
|
||||
vec4[] snake_destroy_particle_frames;
|
||||
vec4[] smoke_frames;
|
||||
|
||||
|
||||
bool move_system = true;
|
||||
bool draw_system = true;
|
||||
|
||||
|
|
@ -83,16 +107,30 @@ struct Snake
|
|||
|
||||
void drawMap()
|
||||
{
|
||||
const float px = 1.0/512.0;
|
||||
foreach(x; 0 .. map_size)
|
||||
{
|
||||
foreach(y; 0 .. map_size)
|
||||
{
|
||||
switch(element(ivec2(x,y)).type)
|
||||
{
|
||||
case MapElement.Type.apple:launcher.renderer.draw(texture, vec2(x*32,y*32), vec2(32,32), vec4(0,32*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake:launcher.renderer.draw(texture, vec2(x*32,y*32), vec2(32,32), vec4(0,48*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.wall:launcher.renderer.draw(texture, vec2(x*32,y*32), vec2(32,32), vec4(0,0,1,1), 0, 0 , 0);break;
|
||||
case MapElement.Type.apple:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(0,32*px,16*px,16*px), 0, 0 , 0);break;
|
||||
|
||||
case MapElement.Type.snake_head_up:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(48*px,112*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_head_down:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(48*px,144*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_head_left:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(0,128*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_head_right:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(32*px,128*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_tail_up:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(16*px,112*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_tail_down:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(0,112*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_tail_left:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(32*px,112*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_tail_right:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(0,144*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_turn_ld:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(64*px,128*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_turn_lu:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(32*px,144*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_turn_rd:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(16*px,144*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_turn_ru:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(64*px,112*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_vertical:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(16*px,128*px,16*px,16*px), 0, 0 , 0);break;
|
||||
case MapElement.Type.snake_horizontal:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(48*px,128*px,16*px,16*px), 0, 0 , 0);break;
|
||||
|
||||
case MapElement.Type.wall:launcher.renderer.draw(texture, vec2(x*16,y*16), vec2(16,16), vec4(0,0,1,1), 0, 0 , 0);break;
|
||||
default:break;
|
||||
}
|
||||
}
|
||||
|
|
@ -101,6 +139,19 @@ struct Snake
|
|||
|
||||
}
|
||||
|
||||
struct Animation
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
struct CAnimation
|
||||
{
|
||||
mixin ECS.Component;
|
||||
|
||||
vec4[] frames;
|
||||
float time = 0;
|
||||
}
|
||||
|
||||
struct CILocation
|
||||
{
|
||||
mixin ECS.Component;
|
||||
|
|
@ -116,7 +167,7 @@ struct CLocation
|
|||
|
||||
alias location this;
|
||||
|
||||
vec2 location;
|
||||
vec2 location = vec2(0,0);
|
||||
}
|
||||
|
||||
struct CSnake
|
||||
|
|
@ -176,13 +227,15 @@ struct CApple
|
|||
struct CParticle
|
||||
{
|
||||
mixin ECS.Component;
|
||||
|
||||
float life = 0;
|
||||
}
|
||||
|
||||
struct CParticleVector
|
||||
{
|
||||
mixin ECS.Component;
|
||||
|
||||
vec2 velocity;
|
||||
vec2 velocity = vec2(0,0);
|
||||
}
|
||||
|
||||
struct CMovement
|
||||
|
|
@ -226,10 +279,98 @@ struct AppleSystem
|
|||
}
|
||||
}
|
||||
|
||||
struct ParticleSystem
|
||||
{
|
||||
mixin ECS.System!1;
|
||||
|
||||
struct EntitiesData
|
||||
{
|
||||
uint length;
|
||||
@readonly Entity[] entities;
|
||||
@readonly CParticle[] particle;
|
||||
}
|
||||
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
foreach(i;0..data.length)
|
||||
{
|
||||
data.particle[i].life -= launcher.delta_time;
|
||||
if(data.particle[i].life < 0)launcher.manager.removeEntity(data.entities[i].id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct ParticleMovementSystem
|
||||
{
|
||||
mixin ECS.System!1;
|
||||
|
||||
struct EntitiesData
|
||||
{
|
||||
uint length;
|
||||
@readonly Entity[] entities;
|
||||
@readonly CParticleVector[] movement;
|
||||
CLocation[] location;
|
||||
}
|
||||
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
foreach(i;0..data.length)
|
||||
{
|
||||
data.location[i].location -= data.movement[i].velocity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
struct AnimationSystem
|
||||
{
|
||||
mixin ECS.System!1;
|
||||
|
||||
struct EntitiesData
|
||||
{
|
||||
uint length;
|
||||
CAnimation[] animation;
|
||||
}
|
||||
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
foreach(i;0..data.length)
|
||||
{
|
||||
data.animation[i].time += launcher.delta_time * 0.01;
|
||||
while(data.animation[i].time >= data.animation[i].frames.length)data.animation[i].time -= cast(float)data.animation[i].frames.length;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
struct AnimationRenderSystem
|
||||
{
|
||||
mixin ECS.System!1;
|
||||
|
||||
struct EntitiesData
|
||||
{
|
||||
uint length;
|
||||
@readonly CAnimation[] animation;
|
||||
@readonly CLocation[] location;
|
||||
}
|
||||
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
foreach(i;0..data.length)
|
||||
{
|
||||
launcher.renderer.draw(snake.texture, cast(vec2)cast(ivec2)data.location[i].location, vec2(16,16), data.animation[i].frames[cast(int)(data.animation[i].time)], 0, 0 , 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct MoveSystem
|
||||
{
|
||||
mixin ECS.System!64;
|
||||
|
||||
EntityTemplate* destroy_template;
|
||||
CLocation* destroy_location;
|
||||
CParticleVector* destroy_vector;
|
||||
|
||||
struct EntitiesData
|
||||
{
|
||||
uint length;
|
||||
|
|
@ -239,6 +380,13 @@ struct MoveSystem
|
|||
CILocation[] location;
|
||||
}
|
||||
|
||||
void setTemplates()
|
||||
{
|
||||
destroy_template = snake.snake_destroy_particle;
|
||||
destroy_location = destroy_template.getComponent!CLocation;
|
||||
destroy_vector = destroy_template.getComponent!CParticleVector;
|
||||
}
|
||||
|
||||
void moveLocation(ref CILocation location, CMovement.Direction direction)
|
||||
{
|
||||
final switch(direction)
|
||||
|
|
@ -276,6 +424,56 @@ struct MoveSystem
|
|||
else .snake.element(MapElement(),location);
|
||||
}
|
||||
|
||||
static CMovement.Direction getDirection(ivec2 p1, ivec2 p2)
|
||||
{
|
||||
if(p1.x - p2.x == -1)return CMovement.direction.right;
|
||||
else if(p1.x - p2.x == 1)return CMovement.direction.left;
|
||||
else if(p1.y - p2.y == -1)return CMovement.direction.up;
|
||||
else if(p1.y - p2.y == 1)return CMovement.direction.down;
|
||||
else if(p1.x - p2.x > 1)return CMovement.direction.right;
|
||||
else if(p1.x - p2.x < -1)return CMovement.direction.left;
|
||||
else if(p1.y - p2.y > 1)return CMovement.direction.up;
|
||||
else return CMovement.direction.down;
|
||||
}
|
||||
|
||||
static MapElement.Type snakePart(ivec2 p1, ivec2 p2, ivec2 p3)
|
||||
{
|
||||
CMovement.Direction direction = getDirection(p1, p2);
|
||||
CMovement.Direction direction2 = getDirection(p1, p3);
|
||||
uint case_ = direction*4 + direction2;
|
||||
final switch(case_)
|
||||
{
|
||||
case 0:return MapElement.Type.snake_horizontal;
|
||||
case 1:return MapElement.Type.snake_horizontal;
|
||||
case 2:return MapElement.Type.snake_turn_lu;
|
||||
case 3:return MapElement.Type.snake_turn_ru;
|
||||
case 4:return MapElement.Type.snake_horizontal;
|
||||
case 5:return MapElement.Type.snake_horizontal;
|
||||
case 6:return MapElement.Type.snake_turn_ld;
|
||||
case 7:return MapElement.Type.snake_turn_rd;
|
||||
case 8:return MapElement.Type.snake_turn_lu;
|
||||
case 9:return MapElement.Type.snake_turn_ld;
|
||||
case 10:return MapElement.Type.snake_vertical;
|
||||
case 11:return MapElement.Type.snake_vertical;
|
||||
case 12:return MapElement.Type.snake_turn_ru;
|
||||
case 13:return MapElement.Type.snake_turn_rd;
|
||||
case 14:return MapElement.Type.snake_vertical;
|
||||
case 15:return MapElement.Type.snake_vertical;
|
||||
}
|
||||
}
|
||||
|
||||
static MapElement.Type snakeTail(ivec2 p1, ivec2 p2)
|
||||
{
|
||||
CMovement.Direction direction = getDirection(p1, p2);
|
||||
final switch(direction)
|
||||
{
|
||||
case CMovement.Direction.up:return MapElement.Type.snake_tail_up;
|
||||
case CMovement.Direction.down:return MapElement.Type.snake_tail_down;
|
||||
case CMovement.Direction.left:return MapElement.Type.snake_tail_left;
|
||||
case CMovement.Direction.right:return MapElement.Type.snake_tail_right;
|
||||
}
|
||||
}
|
||||
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
if(data.snakes)
|
||||
|
|
@ -286,21 +484,104 @@ struct MoveSystem
|
|||
moveLocation(data.location[i], data.movement[i].direction);
|
||||
final switch(snake.element(data.location[i].location).type)
|
||||
{
|
||||
case MapElement.Type.snake:
|
||||
launcher.manager.removeEntity(data.entities[i].id);
|
||||
break;
|
||||
case MapElement.Type.wall:
|
||||
case MapElement.Type.snake_head_up:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_head_down:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_head_left:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_head_right:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_tail_up:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_tail_down:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_tail_left:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_tail_right:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_turn_ld:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_turn_lu:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_turn_rd:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_turn_ru:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_vertical:goto case(MapElement.Type.snake_horizontal);
|
||||
case MapElement.Type.snake_horizontal:
|
||||
foreach(ivec2 loc; data.snakes[i].parts)
|
||||
{
|
||||
destroy_location.x = loc.x * 16;
|
||||
destroy_location.y = loc.y * 16;
|
||||
snake.element(MapElement(MapElement.Type.empty, EntityID()),loc);
|
||||
launcher.manager.addEntity(snake.snake_destroy_particle);
|
||||
foreach(j;0..10)
|
||||
{
|
||||
destroy_location.x = loc.x * 16 + randomf() * 8 - 4;
|
||||
destroy_location.y = loc.y * 16 + randomf() * 8 - 4;
|
||||
destroy_vector.velocity = vec2(randomf(),randomf())*0.4-0.2;
|
||||
snake.element(MapElement(MapElement.Type.empty, EntityID()),loc);
|
||||
launcher.manager.addEntity(snake.snake_destroy_particle);
|
||||
}
|
||||
|
||||
}
|
||||
destroy_location.x = new_location.x * 16;
|
||||
destroy_location.y = new_location.y * 16;
|
||||
snake.element(MapElement(MapElement.Type.empty, EntityID()),new_location);
|
||||
launcher.manager.addEntity(snake.snake_destroy_particle);
|
||||
launcher.manager.removeEntity(data.entities[i].id);
|
||||
break;
|
||||
case MapElement.Type.wall:break;
|
||||
//launcher.manager.removeEntity(data.entities[i].id);
|
||||
//break;
|
||||
case MapElement.Type.empty:
|
||||
moveSnake(data.snakes[i], new_location);
|
||||
snake.element(MapElement(MapElement.Type.snake, data.entities[i].id),data.location[i].location);
|
||||
final switch(data.movement[i].direction)
|
||||
{
|
||||
case CMovement.Direction.up:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_up, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.right:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_right, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.down:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_down, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.left:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_left, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
}
|
||||
if(data.snakes[i].parts.length > 1)
|
||||
{
|
||||
MapElement.Type elem_type = snakePart(data.snakes[i].parts[$-1],data.location[i],data.snakes[i].parts[$-2]);
|
||||
snake.element(MapElement(elem_type, data.entities[i].id),data.snakes[i].parts[$-1]);
|
||||
elem_type = snakeTail(data.snakes[i].parts[1], data.snakes[i].parts[0]);
|
||||
snake.element(MapElement(elem_type, data.entities[i].id),data.snakes[i].parts[0]);
|
||||
}
|
||||
else if(data.snakes[i].parts.length == 1)
|
||||
{
|
||||
MapElement.Type elem_type = snakeTail(data.location[i], data.snakes[i].parts[0]);
|
||||
snake.element(MapElement(elem_type, data.entities[i].id),data.snakes[i].parts[0]);
|
||||
}
|
||||
break;
|
||||
case MapElement.Type.apple:
|
||||
launcher.manager.removeEntity(snake.element(data.location[i].location).id);
|
||||
data.snakes[i].parts.add(new_location);
|
||||
snake.element(MapElement(MapElement.Type.snake, data.entities[i].id),new_location);
|
||||
snake.element(MapElement(MapElement.Type.snake, data.entities[i].id),data.location[i].location);
|
||||
if(data.snakes[i].parts.length < 100)data.snakes[i].parts.add(new_location);
|
||||
|
||||
if(data.snakes[i].parts.length > 1)
|
||||
{
|
||||
MapElement.Type elem_type = snakePart(data.snakes[i].parts[$-1],data.location[i],data.snakes[i].parts[$-2]);
|
||||
snake.element(MapElement(elem_type, data.entities[i].id),data.snakes[i].parts[$-1]);
|
||||
}
|
||||
else if(data.snakes[i].parts.length == 1)
|
||||
{
|
||||
MapElement.Type elem_type = snakeTail(data.location[i], new_location);
|
||||
snake.element(MapElement(elem_type, data.entities[i].id),new_location);
|
||||
}
|
||||
final switch(data.movement[i].direction)
|
||||
{
|
||||
case CMovement.Direction.up:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_up, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.right:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_right, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.down:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_down, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
case CMovement.Direction.left:
|
||||
snake.element(MapElement(MapElement.Type.snake_head_left, data.entities[i].id),data.location[i].location);
|
||||
break;
|
||||
}
|
||||
snake.addApple();
|
||||
break;
|
||||
}
|
||||
|
|
@ -455,19 +736,31 @@ void snakeStart()
|
|||
launcher.manager.registerComponent!CSnake;
|
||||
launcher.manager.registerComponent!CApple;
|
||||
launcher.manager.registerComponent!CParticle;
|
||||
launcher.manager.registerComponent!CParticleVector;
|
||||
launcher.manager.registerComponent!CMovement;
|
||||
launcher.manager.registerComponent!CInput;
|
||||
launcher.manager.registerComponent!CAnimation;
|
||||
|
||||
launcher.manager.registerSystem!MoveSystem(0,"fixed");
|
||||
launcher.manager.registerSystem!InputSystem(-100);
|
||||
launcher.manager.registerSystem!FixSnakeDirectionSystem(-1,"fixed");
|
||||
launcher.manager.registerSystem!AppleSystem(-1,"fixed");
|
||||
launcher.manager.registerSystem!AnimationRenderSystem(100);
|
||||
launcher.manager.registerSystem!AnimationSystem(-1);
|
||||
launcher.manager.registerSystem!ParticleSystem(-1);
|
||||
launcher.manager.registerSystem!ParticleMovementSystem(-1);
|
||||
|
||||
launcher.manager.endRegister();
|
||||
|
||||
launcher.gui_manager.addSystem(MoveSystem.system_id,"Move System");
|
||||
launcher.gui_manager.addSystem(InputSystem.system_id,"Input System");
|
||||
launcher.gui_manager.addSystem(FixSnakeDirectionSystem.system_id,"Fix Direction System");
|
||||
launcher.gui_manager.addSystem(AnimationRenderSystem.system_id,"Animation Render System");
|
||||
launcher.gui_manager.addSystem(AnimationSystem.system_id,"Animation System");
|
||||
launcher.gui_manager.addSystem(ParticleSystem.system_id,"Particle Life System");
|
||||
launcher.gui_manager.addSystem(ParticleMovementSystem.system_id,"Particle Movement System");
|
||||
|
||||
snake.snake_destroy_particle_frames = Mallocator.makeArray([vec4(64,144,16,16)*px,vec4(80,144,16,16)*px,vec4(96,144,16,16)*px,vec4(112,144,16,16)*px].staticArray);
|
||||
|
||||
{
|
||||
ushort[4] components = [CILocation.component_id, CSnake.component_id, CMovement.component_id, CInput.component_id];
|
||||
|
|
@ -477,14 +770,26 @@ void snakeStart()
|
|||
launcher.manager.addEntity(snake.snake_tmpl);
|
||||
}
|
||||
|
||||
{
|
||||
snake.snake_destroy_particle = launcher.manager.allocateTemplate([CLocation.component_id, CParticle.component_id, CParticleVector.component_id, CAnimation.component_id].staticArray);
|
||||
CAnimation* canim = snake.snake_destroy_particle.getComponent!CAnimation;
|
||||
canim.frames = snake.snake_destroy_particle_frames;
|
||||
CParticle* particle = snake.snake_destroy_particle.getComponent!CParticle;
|
||||
particle.life = 400;
|
||||
}
|
||||
|
||||
{
|
||||
ushort[2] components = [CILocation.component_id, CApple.component_id];
|
||||
snake.apple_tmpl = launcher.manager.allocateTemplate(components);
|
||||
snake.addApple();
|
||||
}
|
||||
|
||||
|
||||
launcher.gui_manager.addTemplate(snake.snake_tmpl, "Snake");
|
||||
launcher.gui_manager.addTemplate(snake.apple_tmpl, "Apple");
|
||||
launcher.gui_manager.addTemplate(snake.snake_destroy_particle, "Particle");
|
||||
|
||||
MoveSystem* move_system = launcher.manager.getSystem!MoveSystem();
|
||||
move_system.setTemplates();
|
||||
|
||||
/*foreach(i; 0..10)
|
||||
foreach(j; 0..10)
|
||||
|
|
@ -520,8 +825,8 @@ void snakeTool(vec2 position, Tool tool, int size)
|
|||
position.x += (randomf - 0.5) * size;
|
||||
position.y += (randomf - 0.5) * size;
|
||||
ivec2 ipos;
|
||||
ipos.x = cast(int)(position.x / 32);
|
||||
ipos.y = cast(int)(position.y / 32);
|
||||
ipos.x = cast(int)(position.x / 16);
|
||||
ipos.y = cast(int)(position.y / 16);
|
||||
*ilocation = ipos;
|
||||
if(snake.element(ipos).type != MapElement.Type.empty)return;
|
||||
}
|
||||
|
|
@ -540,6 +845,8 @@ void snakeEvent(SDL_Event* event)
|
|||
|
||||
bool snakeLoop()
|
||||
{
|
||||
launcher.render_position = (vec2(launcher.window_size.x,launcher.window_size.y)*launcher.scalling - vec2(288,288)) * 0.5;
|
||||
|
||||
/*if(launcher.show_demo_wnd)
|
||||
{
|
||||
igSetNextWindowPos(ImVec2(800 - 260, 30), ImGuiCond_Once, ImVec2(0,0));
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ import ecs_utils.gfx.texture;
|
|||
import ecs_utils.math.vector;
|
||||
import ecs_utils.utils;
|
||||
|
||||
enum float px = 1.0/512.0;
|
||||
|
||||
extern(C):
|
||||
|
||||
/*#######################################################################################################################
|
||||
|
|
@ -34,7 +36,7 @@ struct SpaceInvaders
|
|||
bool move_system = true;
|
||||
bool draw_system = true;
|
||||
|
||||
const vec2 map_size = vec2(600,600);
|
||||
const vec2 map_size = vec2(400,300);
|
||||
const float cell_size = 60;
|
||||
}
|
||||
|
||||
|
|
@ -101,7 +103,7 @@ struct CScale
|
|||
///use component as it value
|
||||
alias value this;
|
||||
|
||||
vec2 value = vec2(32,32);
|
||||
vec2 value = vec2(16,16);
|
||||
}
|
||||
|
||||
struct CTexture
|
||||
|
|
@ -564,8 +566,8 @@ struct MovementSystem
|
|||
{
|
||||
foreach(i;0..data.length)
|
||||
{
|
||||
data.locations[i].x += data.velocity[i].x * launcher.delta_time;
|
||||
data.locations[i].y += data.velocity[i].y * launcher.delta_time;
|
||||
data.locations[i].x += data.velocity[i].x * launcher.delta_time * 0.5;
|
||||
data.locations[i].y += data.velocity[i].y * launcher.delta_time * 0.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -587,6 +589,7 @@ struct InputMovementSystem
|
|||
const (CInput)[] input;
|
||||
//components are treated as required by default
|
||||
CLocation[] locations;
|
||||
CTexture[] textures;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -595,6 +598,7 @@ struct InputMovementSystem
|
|||
*/
|
||||
bool onBegin()
|
||||
{
|
||||
move_vector = vec2(0,0);
|
||||
if(launcher.getKeyState(SDL_SCANCODE_W))
|
||||
{
|
||||
move_vector = vec2(0,1);
|
||||
|
|
@ -616,7 +620,7 @@ struct InputMovementSystem
|
|||
return true;
|
||||
}
|
||||
//don't call system update because no key pressed
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -627,11 +631,21 @@ struct InputMovementSystem
|
|||
*/
|
||||
void onUpdate(EntitiesData data)
|
||||
{
|
||||
if(move_vector.x == 0)
|
||||
{
|
||||
foreach(i; 0..data.length)
|
||||
{
|
||||
data.textures[i].coords = vec4(0*px,80*px,48*px,32*px);
|
||||
}
|
||||
return;
|
||||
}
|
||||
//move every entity using movement vector
|
||||
foreach(i; 0..data.length)
|
||||
{
|
||||
data.locations[i].x += move_vector.x * launcher.delta_time * 0.5;
|
||||
data.locations[i].y += move_vector.y * launcher.delta_time * 0.5;
|
||||
data.locations[i].x += move_vector.x * launcher.delta_time * 0.25;
|
||||
data.locations[i].y += move_vector.y * launcher.delta_time * 0.25;
|
||||
if(move_vector.x > 0)data.textures[i].coords = vec4(48*px,80*px,48*px,32*px);
|
||||
else data.textures[i].coords = vec4(0*px,80*px,48*px,32*px);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -644,8 +658,6 @@ __gshared SpaceInvaders* space_invaders;
|
|||
|
||||
void spaceInvadersStart()
|
||||
{
|
||||
const float px = 1.0/512.0;
|
||||
|
||||
space_invaders = Mallocator.make!SpaceInvaders;
|
||||
|
||||
space_invaders.texture.create();
|
||||
|
|
@ -690,9 +702,11 @@ void spaceInvadersStart()
|
|||
ushort[7] components = [CLocation.component_id, CTexture.component_id, CInput.component_id, CShip.component_id, CScale.component_id, CLaserWeapon.component_id, CShootDirection.component_id];
|
||||
space_invaders.ship_tmpl = launcher.manager.allocateTemplate(components);
|
||||
|
||||
CScale* scale_comp = space_invaders.ship_tmpl.getComponent!CScale;
|
||||
scale_comp.value = vec2(48,32);
|
||||
CTexture* tex_comp = space_invaders.ship_tmpl.getComponent!CTexture;
|
||||
tex_comp.tex = space_invaders.texture;//ship_tex;
|
||||
tex_comp.coords = vec4(0*px,48*px,16*px,16*px);
|
||||
tex_comp.coords = vec4(0*px,80*px,48*px,32*px);
|
||||
CLocation* loc_comp = space_invaders.ship_tmpl.getComponent!CLocation;
|
||||
loc_comp.value = vec2(64,64);
|
||||
CLaserWeapon* weapon = space_invaders.ship_tmpl.getComponent!CLaserWeapon;
|
||||
|
|
@ -707,9 +721,9 @@ void spaceInvadersStart()
|
|||
|
||||
CTexture* tex_comp = space_invaders.laser_tmpl.getComponent!CTexture;
|
||||
tex_comp.tex = space_invaders.texture;//laser_tex;
|
||||
tex_comp.coords = vec4(0*px,48*px,16*px,16*px);
|
||||
tex_comp.coords = vec4(0*px,24*px,2*px,8*px);
|
||||
CScale* scale_comp = space_invaders.laser_tmpl.getComponent!CScale;
|
||||
scale_comp.value = vec2(4,16);
|
||||
scale_comp.value = vec2(2,8);
|
||||
CVelocity* vel_comp = space_invaders.laser_tmpl.getComponent!CVelocity;
|
||||
vel_comp.value = vec2(0,1);
|
||||
}
|
||||
|
|
@ -727,7 +741,7 @@ void spaceInvadersStart()
|
|||
tex_comp.tex = space_invaders.texture;//ship_tex;
|
||||
tex_comp.coords = vec4(32*px,32*px,16*px,16*px);
|
||||
CLocation* loc_comp = space_invaders.enemy_tmpl.getComponent!CLocation;
|
||||
loc_comp.value = vec2(64,space_invaders.map_size.y - 64);
|
||||
loc_comp.value = vec2(64,space_invaders.map_size.y - 16);
|
||||
CShootDirection* shoot_dir_comp = space_invaders.enemy_tmpl.getComponent!CShootDirection;
|
||||
shoot_dir_comp.direction = Direction.down;
|
||||
CVelocity* vel_comp = space_invaders.enemy_tmpl.getComponent!CVelocity;
|
||||
|
|
@ -738,17 +752,17 @@ void spaceInvadersStart()
|
|||
current_entity = launcher.manager.addEntity(space_invaders.enemy_tmpl);
|
||||
launcher.manager.addComponents(current_entity.id,CSideMove(0));
|
||||
|
||||
loc_comp.value = vec2(128,space_invaders.map_size.y - 64);
|
||||
loc_comp.value = vec2(128,space_invaders.map_size.y - 16);
|
||||
current_entity = launcher.manager.addEntity(space_invaders.enemy_tmpl);
|
||||
launcher.manager.addComponents(current_entity.id,CSideMove(-1));
|
||||
|
||||
enemy_id = current_entity.id;
|
||||
//enemy_tmpl = launcher.manager.allocateTemplate(current_entity.id);
|
||||
|
||||
loc_comp.value = vec2(256,space_invaders.map_size.y - 64);
|
||||
loc_comp.value = vec2(256,space_invaders.map_size.y - 16);
|
||||
launcher.manager.addEntity(space_invaders.enemy_tmpl);
|
||||
|
||||
loc_comp.value = vec2(0,space_invaders.map_size.y - 64);
|
||||
loc_comp.value = vec2(0,space_invaders.map_size.y - 16);
|
||||
current_entity = launcher.manager.addEntity(space_invaders.enemy_tmpl);
|
||||
launcher.manager.addComponents(current_entity.id,CSideMove(0));
|
||||
|
||||
|
|
@ -809,6 +823,7 @@ void spaceInvadersEvent(SDL_Event* event)
|
|||
|
||||
bool spaceInvadersLoop()
|
||||
{
|
||||
launcher.render_position = (vec2(launcher.window_size.x,launcher.window_size.y)*launcher.scalling - vec2(400,300)) * 0.5;
|
||||
|
||||
/*if(launcher.show_demo_wnd)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ struct Buffer
|
|||
glBufferStorage(GL_ARRAY_BUFFER,size*count,data, flags);
|
||||
}*/
|
||||
|
||||
void bufferSubData(uint size, uint offset, void* data) nothrow
|
||||
void bufferSubData(BindTarget target, uint size, uint offset, void* data) nothrow
|
||||
{
|
||||
bind(BindTarget.array);
|
||||
glBufferSubData(GL_ARRAY_BUFFER,offset,size,data);
|
||||
bind(target);
|
||||
glBufferSubData(target,offset,size,data);
|
||||
}
|
||||
|
||||
void map(BindTarget target) nothrow
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ struct Renderer
|
|||
|
||||
alias Technique = RenderTechnique;
|
||||
|
||||
__gshared Technique technique = Technique.simple;
|
||||
__gshared Technique technique = Technique.vbo_batch;
|
||||
void* data_ptr;
|
||||
|
||||
//import ecs_utils.core : RenderTechnique;
|
||||
|
|
@ -339,6 +339,7 @@ struct Renderer
|
|||
//import core.stdc.string;
|
||||
with(this_)
|
||||
{
|
||||
if(item_id >= MaxObjects)return;
|
||||
//pos += view_pos;
|
||||
size.x *= view_size.x;
|
||||
size.y *= view_size.y;
|
||||
|
|
@ -470,8 +471,8 @@ struct Renderer
|
|||
break;
|
||||
case Technique.vbo_batch:
|
||||
//if(data_index){
|
||||
batch_vbo[0].bufferSubData(item_id*4*16,0,batch_vertices.ptr);
|
||||
batch_ibo[0].bufferSubData(item_id*6*2,0,batch_indices.ptr);
|
||||
batch_vbo[0].bufferSubData(Buffer.BindTarget.array,item_id*4*16,0,batch_vertices.ptr);
|
||||
batch_ibo[0].bufferSubData(Buffer.BindTarget.element_array,item_id*6*2,0,batch_indices.ptr);
|
||||
|
||||
batch_vbo[0].bind(Buffer.BindTarget.array);
|
||||
batch_ibo[0].bind(Buffer.BindTarget.element_array);
|
||||
|
|
@ -480,8 +481,8 @@ struct Renderer
|
|||
glVertexAttribPointer(1,2,GL_FLOAT,false,16,cast(void*)8);//}
|
||||
break;
|
||||
case Technique.instanced_attrib_divisor:
|
||||
ubos[0].bufferSubData(data_index,0,uniform_block.ptr);
|
||||
ubos[0].bind(Buffer.BindTarget.array);
|
||||
ubos[0].bufferSubData(Buffer.BindTarget.uniform,data_index,0,uniform_block.ptr);
|
||||
ubos[0].bind(Buffer.BindTarget.uniform);
|
||||
glEnableVertexAttribArray(2);
|
||||
glEnableVertexAttribArray(3);
|
||||
glEnableVertexAttribArray(4);
|
||||
|
|
@ -496,7 +497,7 @@ struct Renderer
|
|||
break;
|
||||
case Technique.uniform_buffer:
|
||||
//ubos[0].bufferData(1,64*MaxObjects,BufferUsage,null);
|
||||
/*if(data_index)*/ubos[0].bufferSubData(data_index,0,uniform_block.ptr);
|
||||
/*if(data_index)*/ubos[0].bufferSubData(Buffer.BindTarget.uniform,data_index,0,uniform_block.ptr);
|
||||
break;
|
||||
case Technique.uniform_buffer_indexed:
|
||||
ubos[0].bindRange(Buffer.BindTarget.uniform,0,0,block_max_size);
|
||||
|
|
@ -581,6 +582,8 @@ struct Renderer
|
|||
{
|
||||
material_id = render_list[i].material_id;
|
||||
GfxConfig.materials[material_id].bind();
|
||||
float[3*4] data = [1,0,0,1,0,0,0,0,0,0,1,1];
|
||||
GfxConfig.materials[material_id].pushUniforms(data.ptr);
|
||||
}
|
||||
if(texture.data != render_list[i].texture.data)
|
||||
{
|
||||
|
|
@ -589,17 +592,17 @@ struct Renderer
|
|||
}
|
||||
|
||||
uint instance_count = 16_384;
|
||||
if(i*16_384 > item_id)
|
||||
if((i+1)*16_384 > item_id)
|
||||
{
|
||||
instance_count = i*16_384 - item_id;
|
||||
instance_count = item_id%16_384;
|
||||
}
|
||||
|
||||
/*glVertexAttribPointer(0,2,GL_FLOAT,false,16,cast(void*)(i*16_384*4*16));
|
||||
glVertexAttribPointer(0,2,GL_FLOAT,false,16,cast(void*)(i*16_384*4*16));
|
||||
glVertexAttribPointer(1,2,GL_FLOAT,false,16,cast(void*)(i*16_384*4*16+8));
|
||||
|
||||
glDrawElements(GL_TRIANGLES,instance_count*6,GL_UNSIGNED_SHORT,cast(void*)(i*16_384*6*2));*/
|
||||
glDrawElements(GL_TRIANGLES,instance_count*6,GL_UNSIGNED_SHORT,cast(void*)(i*16_384*6*2));
|
||||
|
||||
glDrawElementsBaseVertex(GL_TRIANGLES,instance_count*6,GL_UNSIGNED_SHORT,cast(void*)(i*16_384*6*2),i*16_384*4);
|
||||
//glDrawElementsBaseVertex(GL_TRIANGLES,instance_count*6,GL_UNSIGNED_SHORT,cast(void*)(i*16_384*6*2),i*16_384*4);
|
||||
}
|
||||
}
|
||||
else if(technique == Technique.ssbo_instanced || technique == Technique.instanced_attrib_divisor)
|
||||
|
|
@ -794,9 +797,10 @@ struct Renderer
|
|||
|
||||
void view(vec2 pos, vec2 size)
|
||||
{
|
||||
view_pos = pos * size - 1;
|
||||
//view_pos = pos * size - 1;
|
||||
view_size = vec2(2/size.x,2/size.y);
|
||||
sdl_transform = vec4(0,0,1.0/size.x,1.0/size.y);
|
||||
view_pos = (pos - size * 0.5) * view_size;
|
||||
}
|
||||
|
||||
__gshared void function(ref Renderer this_, Texture tex, vec2 pos, vec2 size, vec4 coords, float angle, uint material_id, uint mesh_id) __draw;
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ struct Texture
|
|||
data.data[0..$] = (cast(ubyte*)surf.pixels)[0..data.data.length];
|
||||
|
||||
glGenTextures(1, &data.gl_handle);
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glBindTexture(GL_TEXTURE_2D,data.gl_handle);
|
||||
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
|
|
|
|||
|
|
@ -30,6 +30,11 @@ struct vec2
|
|||
else static assert(0, "Operator "~op~" not implemented");
|
||||
}
|
||||
|
||||
ivec2 opCast()
|
||||
{
|
||||
return ivec2(cast(int)x,cast(int)y);
|
||||
}
|
||||
|
||||
void opOpAssign(string op)(vec2 v)
|
||||
{
|
||||
static if (op == "+")
|
||||
|
|
@ -69,6 +74,15 @@ struct vec4
|
|||
}
|
||||
float[4] data;
|
||||
}
|
||||
|
||||
vec4 opBinary(string op)(float v)
|
||||
{
|
||||
static if (op == "+") return vec4(x + v, y + v, z + v, w + v);
|
||||
else static if (op == "-") return vec4(x - v, y - v, z - v, w - v);
|
||||
else static if (op == "*") return vec4(x * v, y * v, z * v, w * v);
|
||||
else static if (op == "/") return vec4(x / v, y / v, z / v, w / v);
|
||||
else static assert(0, "Operator "~op~" not implemented");
|
||||
}
|
||||
}
|
||||
|
||||
struct ivec2
|
||||
|
|
@ -82,6 +96,11 @@ struct ivec2
|
|||
}
|
||||
int[2] data;
|
||||
}
|
||||
|
||||
vec2 opCast()
|
||||
{
|
||||
return vec2(x,y);
|
||||
}
|
||||
}
|
||||
|
||||
struct ivec4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue