Some refactor; update JS with latest changes

This commit is contained in:
Chris Hodapp
2020-07-12 18:24:28 -04:00
parent 6cd73c7323
commit 4a568cb523
14 changed files with 6783 additions and 6720 deletions

View File

@@ -5,8 +5,8 @@ goog.require('cljs.core.constants');
quil.middlewares.deprecated_options.deprecated = new cljs.core.PersistentArrayMap(null, 3, [cljs.core.cst$kw$decor,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, ["2.0","Try :features [:present] for similar effect"], null),cljs.core.cst$kw$target,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, ["2.0","Use :features [:keep-on-top] instead."], null),cljs.core.cst$kw$safe_DASH_draw_DASH_fn,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, ["2.0","Use :features [:no-safe-fns] instead."], null)], null);
quil.middlewares.deprecated_options.check_features_vector = (function quil$middlewares$deprecated_options$check_features_vector(features){
var features__$1 = cljs.core.set(features);
if(cljs.core.truth_((function (){var G__5631 = cljs.core.cst$kw$no_DASH_safe_DASH_draw;
return (features__$1.cljs$core$IFn$_invoke$arity$1 ? features__$1.cljs$core$IFn$_invoke$arity$1(G__5631) : features__$1.call(null,G__5631));
if(cljs.core.truth_((function (){var G__5646 = cljs.core.cst$kw$no_DASH_safe_DASH_draw;
return (features__$1.cljs$core$IFn$_invoke$arity$1 ? features__$1.cljs$core$IFn$_invoke$arity$1(G__5646) : features__$1.call(null,G__5646));
})())){
cljs.core.println.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2(["Feature :no-safe-draw was renamed to :no-safe-fns in Quil 2.1.","Use :feature [:no-safe-fns] now."], 0));
} else {
@@ -21,29 +21,29 @@ return cljs.core.disj.cljs$core$IFn$_invoke$arity$2(features__$1,cljs.core.cst$k
quil.middlewares.deprecated_options.deprecated_options = (function quil$middlewares$deprecated_options$deprecated_options(options){
var options__$1 = cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(options,new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$features], null),quil.middlewares.deprecated_options.check_features_vector);
return cljs.core.into.cljs$core$IFn$_invoke$arity$2(cljs.core.PersistentArrayMap.EMPTY,cljs.core.remove.cljs$core$IFn$_invoke$arity$2(cljs.core.nil_QMARK_,(function (){var iter__4523__auto__ = ((function (options__$1){
return (function quil$middlewares$deprecated_options$deprecated_options_$_iter__5632(s__5633){
return (function quil$middlewares$deprecated_options$deprecated_options_$_iter__5647(s__5648){
return (new cljs.core.LazySeq(null,((function (options__$1){
return (function (){
var s__5633__$1 = s__5633;
var s__5648__$1 = s__5648;
while(true){
var temp__5735__auto__ = cljs.core.seq(s__5633__$1);
var temp__5735__auto__ = cljs.core.seq(s__5648__$1);
if(temp__5735__auto__){
var s__5633__$2 = temp__5735__auto__;
if(cljs.core.chunked_seq_QMARK_(s__5633__$2)){
var c__4521__auto__ = cljs.core.chunk_first(s__5633__$2);
var s__5648__$2 = temp__5735__auto__;
if(cljs.core.chunked_seq_QMARK_(s__5648__$2)){
var c__4521__auto__ = cljs.core.chunk_first(s__5648__$2);
var size__4522__auto__ = cljs.core.count(c__4521__auto__);
var b__5635 = cljs.core.chunk_buffer(size__4522__auto__);
if((function (){var i__5634 = (0);
var b__5650 = cljs.core.chunk_buffer(size__4522__auto__);
if((function (){var i__5649 = (0);
while(true){
if((i__5634 < size__4522__auto__)){
var vec__5636 = cljs.core._nth.cljs$core$IFn$_invoke$arity$2(c__4521__auto__,i__5634);
var name = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5636,(0),null);
var value = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5636,(1),null);
cljs.core.chunk_append(b__5635,(function (){var temp__5733__auto__ = (quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1 ? quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1(name) : quil.middlewares.deprecated_options.deprecated.call(null,name));
if((i__5649 < size__4522__auto__)){
var vec__5651 = cljs.core._nth.cljs$core$IFn$_invoke$arity$2(c__4521__auto__,i__5649);
var name = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5651,(0),null);
var value = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5651,(1),null);
cljs.core.chunk_append(b__5650,(function (){var temp__5733__auto__ = (quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1 ? quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1(name) : quil.middlewares.deprecated_options.deprecated.call(null,name));
if(cljs.core.truth_(temp__5733__auto__)){
var vec__5639 = temp__5733__auto__;
var version = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5639,(0),null);
var message = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5639,(1),null);
var vec__5654 = temp__5733__auto__;
var version = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5654,(0),null);
var message = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5654,(1),null);
cljs.core.println.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([name,"option was removed in Quil",version,".",message], 0));
return null;
@@ -52,8 +52,8 @@ return new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMP
}
})());
var G__5648 = (i__5634 + (1));
i__5634 = G__5648;
var G__5663 = (i__5649 + (1));
i__5649 = G__5663;
continue;
} else {
return true;
@@ -61,26 +61,26 @@ return true;
break;
}
})()){
return cljs.core.chunk_cons(cljs.core.chunk(b__5635),quil$middlewares$deprecated_options$deprecated_options_$_iter__5632(cljs.core.chunk_rest(s__5633__$2)));
return cljs.core.chunk_cons(cljs.core.chunk(b__5650),quil$middlewares$deprecated_options$deprecated_options_$_iter__5647(cljs.core.chunk_rest(s__5648__$2)));
} else {
return cljs.core.chunk_cons(cljs.core.chunk(b__5635),null);
return cljs.core.chunk_cons(cljs.core.chunk(b__5650),null);
}
} else {
var vec__5642 = cljs.core.first(s__5633__$2);
var name = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5642,(0),null);
var value = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5642,(1),null);
var vec__5657 = cljs.core.first(s__5648__$2);
var name = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5657,(0),null);
var value = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5657,(1),null);
return cljs.core.cons((function (){var temp__5733__auto__ = (quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1 ? quil.middlewares.deprecated_options.deprecated.cljs$core$IFn$_invoke$arity$1(name) : quil.middlewares.deprecated_options.deprecated.call(null,name));
if(cljs.core.truth_(temp__5733__auto__)){
var vec__5645 = temp__5733__auto__;
var version = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5645,(0),null);
var message = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5645,(1),null);
var vec__5660 = temp__5733__auto__;
var version = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5660,(0),null);
var message = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__5660,(1),null);
cljs.core.println.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([name,"option was removed in Quil",version,".",message], 0));
return null;
} else {
return new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [name,value], null);
}
})(),quil$middlewares$deprecated_options$deprecated_options_$_iter__5632(cljs.core.rest(s__5633__$2)));
})(),quil$middlewares$deprecated_options$deprecated_options_$_iter__5647(cljs.core.rest(s__5648__$2)));
}
} else {
return null;

View File

@@ -20,8 +20,8 @@ return null;
var update = cljs.core.cst$kw$update.cljs$core$IFn$_invoke$arity$2(options,cljs.core.identity);
var quil_draw = ((function (draw,update){
return (function (){
var G__6199 = cljs.core.swap_BANG_.cljs$core$IFn$_invoke$arity$2(quil.core.state_atom(),((cljs.core._EQ_.cljs$core$IFn$_invoke$arity$2(quil.core.frame_count(),(1)))?cljs.core.identity:update));
return (draw.cljs$core$IFn$_invoke$arity$1 ? draw.cljs$core$IFn$_invoke$arity$1(G__6199) : draw.call(null,G__6199));
var G__6214 = cljs.core.swap_BANG_.cljs$core$IFn$_invoke$arity$2(quil.core.state_atom(),((cljs.core._EQ_.cljs$core$IFn$_invoke$arity$2(quil.core.frame_count(),(1)))?cljs.core.identity:update));
return (draw.cljs$core$IFn$_invoke$arity$1 ? draw.cljs$core$IFn$_invoke$arity$1(G__6214) : draw.call(null,G__6214));
});})(draw,update))
;
return cljs.core.assoc.cljs$core$IFn$_invoke$arity$3(cljs.core.dissoc.cljs$core$IFn$_invoke$arity$2(options,cljs.core.cst$kw$update),cljs.core.cst$kw$draw,quil_draw);
@@ -36,8 +36,8 @@ quil.middlewares.fun_mode.key_event = (function quil$middlewares$fun_mode$key_ev
return new cljs.core.PersistentArrayMap(null, 3, [cljs.core.cst$kw$key,quil.core.key_as_keyword(),cljs.core.cst$kw$key_DASH_code,quil.core.key_code(),cljs.core.cst$kw$raw_DASH_key,quil.core.raw_key()], null);
});
quil.middlewares.fun_mode.wrap_handler = (function quil$middlewares$fun_mode$wrap_handler(var_args){
var G__6201 = arguments.length;
switch (G__6201) {
var G__6216 = arguments.length;
switch (G__6216) {
case 2:
return quil.middlewares.fun_mode.wrap_handler.cljs$core$IFn$_invoke$arity$2((arguments[(0)]),(arguments[(1)]));
@@ -78,14 +78,14 @@ quil.middlewares.fun_mode.wrap_handler.cljs$lang$maxFixedArity = 3;
quil.middlewares.fun_mode.wrap_handlers = (function quil$middlewares$fun_mode$wrap_handlers(var_args){
var args__4736__auto__ = [];
var len__4730__auto___6205 = arguments.length;
var i__4731__auto___6206 = (0);
var len__4730__auto___6220 = arguments.length;
var i__4731__auto___6221 = (0);
while(true){
if((i__4731__auto___6206 < len__4730__auto___6205)){
args__4736__auto__.push((arguments[i__4731__auto___6206]));
if((i__4731__auto___6221 < len__4730__auto___6220)){
args__4736__auto__.push((arguments[i__4731__auto___6221]));
var G__6207 = (i__4731__auto___6206 + (1));
i__4731__auto___6206 = G__6207;
var G__6222 = (i__4731__auto___6221 + (1));
i__4731__auto___6221 = G__6222;
continue;
} else {
}
@@ -109,11 +109,11 @@ return cljs.core.apply.cljs$core$IFn$_invoke$arity$3(quil.middlewares.fun_mode.w
quil.middlewares.fun_mode.wrap_handlers.cljs$lang$maxFixedArity = (1);
/** @this {Function} */
quil.middlewares.fun_mode.wrap_handlers.cljs$lang$applyTo = (function (seq6203){
var G__6204 = cljs.core.first(seq6203);
var seq6203__$1 = cljs.core.next(seq6203);
quil.middlewares.fun_mode.wrap_handlers.cljs$lang$applyTo = (function (seq6218){
var G__6219 = cljs.core.first(seq6218);
var seq6218__$1 = cljs.core.next(seq6218);
var self__4717__auto__ = this;
return self__4717__auto__.cljs$core$IFn$_invoke$arity$variadic(G__6204,seq6203__$1);
return self__4717__auto__.cljs$core$IFn$_invoke$arity$variadic(G__6219,seq6218__$1);
});
quil.middlewares.fun_mode.wrap_mouse_wheel = (function quil$middlewares$fun_mode$wrap_mouse_wheel(options){

View File

@@ -28,8 +28,8 @@ return new cljs.core.PersistentArrayMap(null, 2, [cljs.core.cst$kw$position,new
quil.middlewares.navigation_2d.setup_2d_nav = (function quil$middlewares$navigation_2d$setup_2d_nav(user_setup,user_settings){
var initial_state = cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([quil.middlewares.navigation_2d.default_position(),cljs.core.select_keys(user_settings,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$position,cljs.core.cst$kw$zoom], null))], 0));
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3((user_setup.cljs$core$IFn$_invoke$arity$0 ? user_setup.cljs$core$IFn$_invoke$arity$0() : user_setup.call(null)),new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$navigation_DASH_2d], null),((function (initial_state){
return (function (p1__6188_SHARP_){
return cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([initial_state,p1__6188_SHARP_], 0));
return (function (p1__6203_SHARP_){
return cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([initial_state,p1__6203_SHARP_], 0));
});})(initial_state))
);
});
@@ -62,15 +62,15 @@ quil.middlewares.navigation_2d.assert_state_has_navigation(state);
quil.core.push_matrix();
var nav_2d_6189 = cljs.core.cst$kw$navigation_DASH_2d.cljs$core$IFn$_invoke$arity$1(state);
var zoom_6190 = cljs.core.cst$kw$zoom.cljs$core$IFn$_invoke$arity$1(nav_2d_6189);
var pos_6191 = cljs.core.cst$kw$position.cljs$core$IFn$_invoke$arity$1(nav_2d_6189);
quil.core.scale.cljs$core$IFn$_invoke$arity$1(zoom_6190);
var nav_2d_6204 = cljs.core.cst$kw$navigation_DASH_2d.cljs$core$IFn$_invoke$arity$1(state);
var zoom_6205 = cljs.core.cst$kw$zoom.cljs$core$IFn$_invoke$arity$1(nav_2d_6204);
var pos_6206 = cljs.core.cst$kw$position.cljs$core$IFn$_invoke$arity$1(nav_2d_6204);
quil.core.scale.cljs$core$IFn$_invoke$arity$1(zoom_6205);
var tr__569__auto___6192 = new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [(((quil.core.width() / (2)) / zoom_6190) - cljs.core.first(pos_6191)),(((quil.core.height() / (2)) / zoom_6190) - cljs.core.second(pos_6191))], null);
var tr__569__auto___6207 = new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [(((quil.core.width() / (2)) / zoom_6205) - cljs.core.first(pos_6206)),(((quil.core.height() / (2)) / zoom_6205) - cljs.core.second(pos_6206))], null);
quil.core.push_matrix();
try{quil.core.translate.cljs$core$IFn$_invoke$arity$1(tr__569__auto___6192);
try{quil.core.translate.cljs$core$IFn$_invoke$arity$1(tr__569__auto___6207);
(user_draw.cljs$core$IFn$_invoke$arity$1 ? user_draw.cljs$core$IFn$_invoke$arity$1(state) : user_draw.call(null,state));
}finally {quil.core.pop_matrix();
@@ -105,15 +105,15 @@ return cljs.core.PersistentArrayMap.EMPTY;
);
return cljs.core.assoc.cljs$core$IFn$_invoke$arity$variadic(options,cljs.core.cst$kw$setup,cljs.core.partial.cljs$core$IFn$_invoke$arity$3(quil.middlewares.navigation_2d.setup_2d_nav,setup,user_settings),cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([cljs.core.cst$kw$draw,cljs.core.partial.cljs$core$IFn$_invoke$arity$2(quil.middlewares.navigation_2d.draw,user_draw),cljs.core.cst$kw$mouse_DASH_dragged,((function (user_settings,user_draw,user_mouse_dragged,user_mouse_wheel,setup){
return (function (state,event){
var G__6193 = quil.middlewares.navigation_2d.mouse_dragged(state,event);
var G__6194 = event;
return (user_mouse_dragged.cljs$core$IFn$_invoke$arity$2 ? user_mouse_dragged.cljs$core$IFn$_invoke$arity$2(G__6193,G__6194) : user_mouse_dragged.call(null,G__6193,G__6194));
var G__6208 = quil.middlewares.navigation_2d.mouse_dragged(state,event);
var G__6209 = event;
return (user_mouse_dragged.cljs$core$IFn$_invoke$arity$2 ? user_mouse_dragged.cljs$core$IFn$_invoke$arity$2(G__6208,G__6209) : user_mouse_dragged.call(null,G__6208,G__6209));
});})(user_settings,user_draw,user_mouse_dragged,user_mouse_wheel,setup))
,cljs.core.cst$kw$mouse_DASH_wheel,((function (user_settings,user_draw,user_mouse_dragged,user_mouse_wheel,setup){
return (function (state,event){
var G__6195 = quil.middlewares.navigation_2d.mouse_wheel(state,event);
var G__6196 = event;
return (user_mouse_wheel.cljs$core$IFn$_invoke$arity$2 ? user_mouse_wheel.cljs$core$IFn$_invoke$arity$2(G__6195,G__6196) : user_mouse_wheel.call(null,G__6195,G__6196));
var G__6210 = quil.middlewares.navigation_2d.mouse_wheel(state,event);
var G__6211 = event;
return (user_mouse_wheel.cljs$core$IFn$_invoke$arity$2 ? user_mouse_wheel.cljs$core$IFn$_invoke$arity$2(G__6210,G__6211) : user_mouse_wheel.call(null,G__6210,G__6211));
});})(user_settings,user_draw,user_mouse_dragged,user_mouse_wheel,setup))
], 0));
});

View File

@@ -27,14 +27,14 @@ return new cljs.core.PersistentArrayMap(null, 3, [cljs.core.cst$kw$position,new
* http://en.wikipedia.org/wiki/Rotation_matrix#Rotation_matrix_from_axis_and_angle
*/
quil.middlewares.navigation_3d.rotate_by_axis_and_angle = (function quil$middlewares$navigation_3d$rotate_by_axis_and_angle(v,axis,angle){
var vec__6121 = axis;
var a_x = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6121,(0),null);
var a_y = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6121,(1),null);
var a_z = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6121,(2),null);
var vec__6124 = v;
var x = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6124,(0),null);
var y = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6124,(1),null);
var z = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6124,(2),null);
var vec__6136 = axis;
var a_x = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6136,(0),null);
var a_y = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6136,(1),null);
var a_z = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6136,(2),null);
var vec__6139 = v;
var x = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6139,(0),null);
var y = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6139,(1),null);
var z = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6139,(2),null);
var cs = quil.core.cos(angle);
var _cs = ((1) - cs);
var sn = quil.core.sin(angle);
@@ -59,23 +59,23 @@ return cljs.core.update_in.cljs$core$IFn$_invoke$arity$5(nav_3d,new cljs.core.Pe
/**
* Vector cross-product: http://en.wikipedia.org/wiki/Cross_product
*/
quil.middlewares.navigation_3d.cross_product = (function quil$middlewares$navigation_3d$cross_product(p__6127,p__6128){
var vec__6129 = p__6127;
var u1 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6129,(0),null);
var u2 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6129,(1),null);
var u3 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6129,(2),null);
var vec__6132 = p__6128;
var v1 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6132,(0),null);
var v2 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6132,(1),null);
var v3 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6132,(2),null);
quil.middlewares.navigation_3d.cross_product = (function quil$middlewares$navigation_3d$cross_product(p__6142,p__6143){
var vec__6144 = p__6142;
var u1 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6144,(0),null);
var u2 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6144,(1),null);
var u3 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6144,(2),null);
var vec__6147 = p__6143;
var v1 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6147,(0),null);
var v2 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6147,(1),null);
var v3 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6147,(2),null);
return new cljs.core.PersistentVector(null, 3, 5, cljs.core.PersistentVector.EMPTY_NODE, [((u2 * v3) - (u3 * v2)),((u3 * v1) - (u1 * v3)),((u1 * v2) - (u2 * v1))], null);
});
/**
* Multiply vector `v` by scalar `mult`.
*/
quil.middlewares.navigation_3d.v_mult = (function quil$middlewares$navigation_3d$v_mult(v,mult){
return cljs.core.mapv.cljs$core$IFn$_invoke$arity$2((function (p1__6135_SHARP_){
return (p1__6135_SHARP_ * mult);
return cljs.core.mapv.cljs$core$IFn$_invoke$arity$2((function (p1__6150_SHARP_){
return (p1__6150_SHARP_ * mult);
}),v);
});
/**
@@ -104,8 +104,8 @@ return quil.middlewares.navigation_3d.v_mult(v,((1) / norm));
quil.middlewares.navigation_3d.rotate_ud = (function quil$middlewares$navigation_3d$rotate_ud(nav_3d,angle){
var axis = quil.middlewares.navigation_3d.cross_product(cljs.core.cst$kw$straight.cljs$core$IFn$_invoke$arity$1(nav_3d),cljs.core.cst$kw$up.cljs$core$IFn$_invoke$arity$1(nav_3d));
var rotate = ((function (axis){
return (function (p1__6136_SHARP_){
return quil.middlewares.navigation_3d.rotate_by_axis_and_angle(p1__6136_SHARP_,axis,angle);
return (function (p1__6151_SHARP_){
return quil.middlewares.navigation_3d.rotate_by_axis_and_angle(p1__6151_SHARP_,axis,angle);
});})(axis))
;
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(nav_3d,new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$straight], null),rotate),new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$up], null),rotate);
@@ -126,8 +126,8 @@ var dy = (cljs.core.cst$kw$y.cljs$core$IFn$_invoke$arity$1(event) - cljs.core.cs
var angle_lr = quil.core.map_range(dx,(0),pixels_in_360,(0),quil.core.TWO_PI);
var angle_ud = quil.core.map_range(dy,(0),pixels_in_360,(0),quil.core.TWO_PI);
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(state,new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$navigation_DASH_3d], null),((function (dx,dy,angle_lr,angle_ud){
return (function (p1__6137_SHARP_){
return quil.middlewares.navigation_3d.rotate_ud(quil.middlewares.navigation_3d.rotate_lr(p1__6137_SHARP_,angle_lr),angle_ud);
return (function (p1__6152_SHARP_){
return quil.middlewares.navigation_3d.rotate_ud(quil.middlewares.navigation_3d.rotate_lr(p1__6152_SHARP_,angle_lr),angle_ud);
});})(dx,dy,angle_lr,angle_ud))
);
}
@@ -141,42 +141,42 @@ quil.middlewares.navigation_3d.space = cljs.core.keyword.cljs$core$IFn$_invoke$a
quil.middlewares.navigation_3d.move = (function quil$middlewares$navigation_3d$move(state,event,step_size){
quil.middlewares.navigation_3d.assert_state_has_navigation(state);
var map__6139 = cljs.core.cst$kw$navigation_DASH_3d.cljs$core$IFn$_invoke$arity$1(state);
var map__6139__$1 = (((((!((map__6139 == null))))?(((((map__6139.cljs$lang$protocol_mask$partition0$ & (64))) || ((cljs.core.PROTOCOL_SENTINEL === map__6139.cljs$core$ISeq$))))?true:false):false))?cljs.core.apply.cljs$core$IFn$_invoke$arity$2(cljs.core.hash_map,map__6139):map__6139);
var up = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6139__$1,cljs.core.cst$kw$up);
var straight = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6139__$1,cljs.core.cst$kw$straight);
var temp__5733__auto__ = (function (){var pred__6141 = cljs.core._EQ_;
var expr__6142 = cljs.core.cst$kw$key.cljs$core$IFn$_invoke$arity$1(event);
if(cljs.core.truth_((function (){var G__6144 = cljs.core.cst$kw$w;
var G__6145 = expr__6142;
return (pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(G__6144,G__6145) : pred__6141.call(null,G__6144,G__6145));
var map__6154 = cljs.core.cst$kw$navigation_DASH_3d.cljs$core$IFn$_invoke$arity$1(state);
var map__6154__$1 = (((((!((map__6154 == null))))?(((((map__6154.cljs$lang$protocol_mask$partition0$ & (64))) || ((cljs.core.PROTOCOL_SENTINEL === map__6154.cljs$core$ISeq$))))?true:false):false))?cljs.core.apply.cljs$core$IFn$_invoke$arity$2(cljs.core.hash_map,map__6154):map__6154);
var up = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6154__$1,cljs.core.cst$kw$up);
var straight = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6154__$1,cljs.core.cst$kw$straight);
var temp__5733__auto__ = (function (){var pred__6156 = cljs.core._EQ_;
var expr__6157 = cljs.core.cst$kw$key.cljs$core$IFn$_invoke$arity$1(event);
if(cljs.core.truth_((function (){var G__6159 = cljs.core.cst$kw$w;
var G__6160 = expr__6157;
return (pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(G__6159,G__6160) : pred__6156.call(null,G__6159,G__6160));
})())){
return straight;
} else {
if(cljs.core.truth_((function (){var G__6146 = cljs.core.cst$kw$s;
var G__6147 = expr__6142;
return (pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(G__6146,G__6147) : pred__6141.call(null,G__6146,G__6147));
if(cljs.core.truth_((function (){var G__6161 = cljs.core.cst$kw$s;
var G__6162 = expr__6157;
return (pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(G__6161,G__6162) : pred__6156.call(null,G__6161,G__6162));
})())){
return quil.middlewares.navigation_3d.v_opposite(straight);
} else {
if(cljs.core.truth_((pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(quil.middlewares.navigation_3d.space,expr__6142) : pred__6141.call(null,quil.middlewares.navigation_3d.space,expr__6142)))){
if(cljs.core.truth_((pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(quil.middlewares.navigation_3d.space,expr__6157) : pred__6156.call(null,quil.middlewares.navigation_3d.space,expr__6157)))){
return quil.middlewares.navigation_3d.v_opposite(up);
} else {
if(cljs.core.truth_((function (){var G__6148 = cljs.core.cst$kw$z;
var G__6149 = expr__6142;
return (pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(G__6148,G__6149) : pred__6141.call(null,G__6148,G__6149));
if(cljs.core.truth_((function (){var G__6163 = cljs.core.cst$kw$z;
var G__6164 = expr__6157;
return (pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(G__6163,G__6164) : pred__6156.call(null,G__6163,G__6164));
})())){
return up;
} else {
if(cljs.core.truth_((function (){var G__6150 = cljs.core.cst$kw$d;
var G__6151 = expr__6142;
return (pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(G__6150,G__6151) : pred__6141.call(null,G__6150,G__6151));
if(cljs.core.truth_((function (){var G__6165 = cljs.core.cst$kw$d;
var G__6166 = expr__6157;
return (pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(G__6165,G__6166) : pred__6156.call(null,G__6165,G__6166));
})())){
return quil.middlewares.navigation_3d.cross_product(straight,up);
} else {
if(cljs.core.truth_((function (){var G__6152 = cljs.core.cst$kw$a;
var G__6153 = expr__6142;
return (pred__6141.cljs$core$IFn$_invoke$arity$2 ? pred__6141.cljs$core$IFn$_invoke$arity$2(G__6152,G__6153) : pred__6141.call(null,G__6152,G__6153));
if(cljs.core.truth_((function (){var G__6167 = cljs.core.cst$kw$a;
var G__6168 = expr__6157;
return (pred__6156.cljs$core$IFn$_invoke$arity$2 ? pred__6156.cljs$core$IFn$_invoke$arity$2(G__6167,G__6168) : pred__6156.call(null,G__6167,G__6168));
})())){
return quil.middlewares.navigation_3d.cross_product(up,straight);
} else {
@@ -190,10 +190,10 @@ return null;
})();
if(cljs.core.truth_(temp__5733__auto__)){
var dir = temp__5733__auto__;
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(state,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$navigation_DASH_3d,cljs.core.cst$kw$position], null),((function (dir,temp__5733__auto__,map__6139,map__6139__$1,up,straight){
return (function (p1__6138_SHARP_){
return quil.middlewares.navigation_3d.v_plus(p1__6138_SHARP_,quil.middlewares.navigation_3d.v_mult(dir,step_size));
});})(dir,temp__5733__auto__,map__6139,map__6139__$1,up,straight))
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(state,new cljs.core.PersistentVector(null, 2, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$navigation_DASH_3d,cljs.core.cst$kw$position], null),((function (dir,temp__5733__auto__,map__6154,map__6154__$1,up,straight){
return (function (p1__6153_SHARP_){
return quil.middlewares.navigation_3d.v_plus(p1__6153_SHARP_,quil.middlewares.navigation_3d.v_mult(dir,step_size));
});})(dir,temp__5733__auto__,map__6154,map__6154__$1,up,straight))
);
} else {
return state;
@@ -206,8 +206,8 @@ return state;
quil.middlewares.navigation_3d.setup_3d_nav = (function quil$middlewares$navigation_3d$setup_3d_nav(user_setup,user_settings){
var initial_state = cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(cljs.core.update_in.cljs$core$IFn$_invoke$arity$3(cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([quil.middlewares.navigation_3d.default_position(),cljs.core.select_keys(user_settings,new cljs.core.PersistentVector(null, 3, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$straight,cljs.core.cst$kw$up,cljs.core.cst$kw$position], null))], 0)),new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$straight], null),quil.middlewares.navigation_3d.v_normalize),new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$up], null),quil.middlewares.navigation_3d.v_normalize);
return cljs.core.update_in.cljs$core$IFn$_invoke$arity$3((user_setup.cljs$core$IFn$_invoke$arity$0 ? user_setup.cljs$core$IFn$_invoke$arity$0() : user_setup.call(null)),new cljs.core.PersistentVector(null, 1, 5, cljs.core.PersistentVector.EMPTY_NODE, [cljs.core.cst$kw$navigation_DASH_3d], null),((function (initial_state){
return (function (p1__6154_SHARP_){
return cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([initial_state,p1__6154_SHARP_], 0));
return (function (p1__6169_SHARP_){
return cljs.core.merge.cljs$core$IFn$_invoke$arity$variadic(cljs.core.prim_seq.cljs$core$IFn$_invoke$arity$2([initial_state,p1__6169_SHARP_], 0));
});})(initial_state))
);
});
@@ -231,13 +231,13 @@ return (function (state,_){
return state;
});})(user_settings,pixels_in_360,step_size,rotate_on,draw))
);
var rotate_on_fn = (function (){var G__6155 = options;
var G__6156 = ((function (G__6155,user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed){
var rotate_on_fn = (function (){var G__6170 = options;
var G__6171 = ((function (G__6170,user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed){
return (function (state,_){
return state;
});})(G__6155,user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed))
});})(G__6170,user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed))
;
return (rotate_on.cljs$core$IFn$_invoke$arity$2 ? rotate_on.cljs$core$IFn$_invoke$arity$2(G__6155,G__6156) : rotate_on.call(null,G__6155,G__6156));
return (rotate_on.cljs$core$IFn$_invoke$arity$2 ? rotate_on.cljs$core$IFn$_invoke$arity$2(G__6170,G__6171) : rotate_on.call(null,G__6170,G__6171));
})();
var setup = cljs.core.cst$kw$setup.cljs$core$IFn$_invoke$arity$2(options,((function (user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn){
return (function (){
@@ -248,35 +248,35 @@ return cljs.core.assoc.cljs$core$IFn$_invoke$arity$variadic(options,cljs.core.cs
return (function (state){
quil.middlewares.navigation_3d.assert_state_has_navigation(state);
var map__6157_6172 = cljs.core.cst$kw$navigation_DASH_3d.cljs$core$IFn$_invoke$arity$1(state);
var map__6157_6173__$1 = (((((!((map__6157_6172 == null))))?(((((map__6157_6172.cljs$lang$protocol_mask$partition0$ & (64))) || ((cljs.core.PROTOCOL_SENTINEL === map__6157_6172.cljs$core$ISeq$))))?true:false):false))?cljs.core.apply.cljs$core$IFn$_invoke$arity$2(cljs.core.hash_map,map__6157_6172):map__6157_6172);
var vec__6158_6174 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6157_6173__$1,cljs.core.cst$kw$straight);
var c_x_6175 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6158_6174,(0),null);
var c_y_6176 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6158_6174,(1),null);
var c_z_6177 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6158_6174,(2),null);
var vec__6161_6178 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6157_6173__$1,cljs.core.cst$kw$up);
var u_x_6179 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6161_6178,(0),null);
var u_y_6180 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6161_6178,(1),null);
var u_z_6181 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6161_6178,(2),null);
var vec__6164_6182 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6157_6173__$1,cljs.core.cst$kw$position);
var p_x_6183 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6164_6182,(0),null);
var p_y_6184 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6164_6182,(1),null);
var p_z_6185 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6164_6182,(2),null);
quil.core.camera.cljs$core$IFn$_invoke$arity$9(p_x_6183,p_y_6184,p_z_6185,(p_x_6183 + c_x_6175),(p_y_6184 + c_y_6176),(p_z_6185 + c_z_6177),u_x_6179,u_y_6180,u_z_6181);
var map__6172_6187 = cljs.core.cst$kw$navigation_DASH_3d.cljs$core$IFn$_invoke$arity$1(state);
var map__6172_6188__$1 = (((((!((map__6172_6187 == null))))?(((((map__6172_6187.cljs$lang$protocol_mask$partition0$ & (64))) || ((cljs.core.PROTOCOL_SENTINEL === map__6172_6187.cljs$core$ISeq$))))?true:false):false))?cljs.core.apply.cljs$core$IFn$_invoke$arity$2(cljs.core.hash_map,map__6172_6187):map__6172_6187);
var vec__6173_6189 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6172_6188__$1,cljs.core.cst$kw$straight);
var c_x_6190 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6173_6189,(0),null);
var c_y_6191 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6173_6189,(1),null);
var c_z_6192 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6173_6189,(2),null);
var vec__6176_6193 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6172_6188__$1,cljs.core.cst$kw$up);
var u_x_6194 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6176_6193,(0),null);
var u_y_6195 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6176_6193,(1),null);
var u_z_6196 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6176_6193,(2),null);
var vec__6179_6197 = cljs.core.get.cljs$core$IFn$_invoke$arity$2(map__6172_6188__$1,cljs.core.cst$kw$position);
var p_x_6198 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6179_6197,(0),null);
var p_y_6199 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6179_6197,(1),null);
var p_z_6200 = cljs.core.nth.cljs$core$IFn$_invoke$arity$3(vec__6179_6197,(2),null);
quil.core.camera.cljs$core$IFn$_invoke$arity$9(p_x_6198,p_y_6199,p_z_6200,(p_x_6198 + c_x_6190),(p_y_6199 + c_y_6191),(p_z_6200 + c_z_6192),u_x_6194,u_y_6195,u_z_6196);
return (draw.cljs$core$IFn$_invoke$arity$1 ? draw.cljs$core$IFn$_invoke$arity$1(state) : draw.call(null,state));
});})(user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn,setup))
,cljs.core.cst$kw$key_DASH_pressed,((function (user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn,setup){
return (function (state,event){
var G__6168 = quil.middlewares.navigation_3d.move(state,event,step_size);
var G__6169 = event;
return (key_pressed.cljs$core$IFn$_invoke$arity$2 ? key_pressed.cljs$core$IFn$_invoke$arity$2(G__6168,G__6169) : key_pressed.call(null,G__6168,G__6169));
var G__6183 = quil.middlewares.navigation_3d.move(state,event,step_size);
var G__6184 = event;
return (key_pressed.cljs$core$IFn$_invoke$arity$2 ? key_pressed.cljs$core$IFn$_invoke$arity$2(G__6183,G__6184) : key_pressed.call(null,G__6183,G__6184));
});})(user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn,setup))
,rotate_on,((function (user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn,setup){
return (function (state,event){
var G__6170 = quil.middlewares.navigation_3d.rotate(state,event,pixels_in_360);
var G__6171 = event;
return (rotate_on_fn.cljs$core$IFn$_invoke$arity$2 ? rotate_on_fn.cljs$core$IFn$_invoke$arity$2(G__6170,G__6171) : rotate_on_fn.call(null,G__6170,G__6171));
var G__6185 = quil.middlewares.navigation_3d.rotate(state,event,pixels_in_360);
var G__6186 = event;
return (rotate_on_fn.cljs$core$IFn$_invoke$arity$2 ? rotate_on_fn.cljs$core$IFn$_invoke$arity$2(G__6185,G__6186) : rotate_on_fn.call(null,G__6185,G__6186));
});})(user_settings,pixels_in_360,step_size,rotate_on,draw,key_pressed,rotate_on_fn,setup))
], 0));
});