small fixes
parent
781e7e4889
commit
b431c9b755
1
MAKE.bat
1
MAKE.bat
|
@ -239,6 +239,7 @@ if "%1"=="push" (
|
||||||
@REM )
|
@REM )
|
||||||
|
|
||||||
call make.bat git
|
call make.bat git
|
||||||
|
git add .
|
||||||
|
|
||||||
git diff --quiet --exit-code
|
git diff --quiet --exit-code
|
||||||
if !ERRORLEVEL! neq 0 (
|
if !ERRORLEVEL! neq 0 (
|
||||||
|
|
|
@ -81,7 +81,7 @@ int main() {
|
||||||
object_model(obj4, m3);
|
object_model(obj4, m3);
|
||||||
object_scale(obj4, vec3(3,3,3));
|
object_scale(obj4, vec3(3,3,3));
|
||||||
object_move(obj4, vec3(-10+6*3,0,-10));
|
object_move(obj4, vec3(-10+6*3,0,-10));
|
||||||
object_pivot(obj4, vec3(0,0,180));
|
object_pivot(obj4, vec3(0,180,180));
|
||||||
|
|
||||||
// spawn object5 (shadertoy)
|
// spawn object5 (shadertoy)
|
||||||
object_t* obj5 = scene_spawn();
|
object_t* obj5 = scene_spawn();
|
||||||
|
|
|
@ -19,7 +19,7 @@ const char *OBJ_MDLS[] = {
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
window_create(85, WINDOW_MSAA8);
|
window_create(85, WINDOW_MSAA8);
|
||||||
window_fps_unlock();
|
// window_fps_unlock();
|
||||||
|
|
||||||
camera_t cam = camera(); {
|
camera_t cam = camera(); {
|
||||||
cam.position = vec3(0, 7.5, 15);
|
cam.position = vec3(0, 7.5, 15);
|
||||||
|
|
|
@ -23,7 +23,7 @@ static double smooth_delta() {
|
||||||
average += time_samples[i];
|
average += time_samples[i];
|
||||||
average /= NUM_SAMPLES;
|
average /= NUM_SAMPLES;
|
||||||
|
|
||||||
time = min(time, average);
|
time = minf(time, average);
|
||||||
return time;
|
return time;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
depot
2
depot
|
@ -1 +1 @@
|
||||||
Subproject commit 6d764dd6019192b1efbf1018bc685bb2a8e495c3
|
Subproject commit c20552ebf8466f6b97692e58e321fbcbde1a89c7
|
|
@ -371241,7 +371241,7 @@ static cook_worker jobs[JOBS_MAX] = {0};
|
||||||
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
||||||
|
|
||||||
#ifndef COOK_ON_DEMAND
|
#ifndef COOK_ON_DEMAND
|
||||||
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 0), false)
|
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 1), false)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
|
@ -459,7 +459,7 @@ static cook_worker jobs[JOBS_MAX] = {0};
|
||||||
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
||||||
|
|
||||||
#ifndef COOK_ON_DEMAND
|
#ifndef COOK_ON_DEMAND
|
||||||
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 0), false)
|
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 1), false)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
|
@ -6268,7 +6268,7 @@ static cook_worker jobs[JOBS_MAX] = {0};
|
||||||
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
static volatile bool cook_cancelable = false, cook_cancelling = false, cook_debug = false;
|
||||||
|
|
||||||
#ifndef COOK_ON_DEMAND
|
#ifndef COOK_ON_DEMAND
|
||||||
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 0), false)
|
#define COOK_ON_DEMAND ifdef(cook, optioni("--cook-on-demand", 1), false)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
Whenever I say:
|
||||||
|
|
||||||
|
# run <name> demo
|
||||||
|
make demos\<name>.c run
|
||||||
|
|
||||||
|
# run <name> dp
|
||||||
|
depot\make <name> run
|
Loading…
Reference in New Issue