qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for constant [] vector expressions.

This commit is contained in:
Bill Currie 2013-06-24 15:42:11 +09:00
parent 7a7a685105
commit 7f50333b2c
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/qfcc/include/expr.h
View File

@ -577,6 +577,8 @@ expr_t *new_move_expr (expr_t *e1, expr_t *e2, struct type_s *type,
*/
void convert_name (expr_t *e);
expr_t *convert_vector (expr_t *e);
expr_t *append_expr (expr_t *block, expr_t *e);
expr_t *reverse_expr_list (expr_t *e);

60
tools/qfcc/source/expr.c
View File

@ -138,6 +138,65 @@ convert:
e->e = new->e;
}
expr_t *
convert_vector (expr_t *e)
{
float val[4];
if (e->type != ex_vector)
return e;
if (e->e.vector.type == &type_vector) {
// guaranteed to have three elements
expr_t *x = e->e.vector.list;
expr_t *y = x->next;
expr_t *z = y->next;
x = fold_constants (cast_expr (&type_float, x));
y = fold_constants (cast_expr (&type_float, y));
z = fold_constants (cast_expr (&type_float, z));
if (is_constant (x) && is_constant (y) && is_constant (z)) {
val[0] = expr_float(x);
val[1] = expr_float(y);
val[2] = expr_float(z);
return new_vector_expr (val);
}
}
if (e->e.vector.type == &type_quaternion) {
// guaranteed to have two or four elements
if (e->e.vector.list->next->next) {
// four vals: w, x, y, z
expr_t *w = e->e.vector.list;
expr_t *x = w->next;
expr_t *y = x->next;
expr_t *z = y->next;
w = fold_constants (cast_expr (&type_float, w));
x = fold_constants (cast_expr (&type_float, x));
y = fold_constants (cast_expr (&type_float, y));
z = fold_constants (cast_expr (&type_float, z));
if (is_constant (w) && is_constant (x) && is_constant (y)
&& is_constant (z)) {
val[0] = expr_float(w);
val[1] = expr_float(x);
val[2] = expr_float(y);
val[3] = expr_float(z);
return new_quaternion_expr (val);
}
} else {
// s, v
expr_t *s = e->e.vector.list;
expr_t *v = s->next;
s = fold_constants (cast_expr (&type_float, s));
v = convert_vector (v);
if (is_constant (s) && is_constant (v)) {
val[0] = expr_float (s);
memcpy (val + 1, expr_vector (v), 3 * sizeof (float));
return new_quaternion_expr (val);
}
}
}
internal_error (e, "bogus vector expression");
}
type_t *
get_type (expr_t *e)
{
@ -2636,6 +2695,7 @@ assign_expr (expr_t *e1, expr_t *e2)
convert_name (e1);
convert_name (e2);
e2 = convert_vector (e2);
if (e1->type == ex_error)
return e1;