qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 04:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Support struct access to full algebra vectors

Browse source 
This makes them actually useable. Multi-vector expressions and variables
will be done soon.
This commit is contained in:
Bill Currie 2023-09-09 23:08:38 +09:00
parent 7f8cc64720
commit ed824405fe
6 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/algebra.h
View file

@ -115,5 +115,7 @@ struct expr_s *algebra_dual (struct expr_s *e);
struct expr_s *algebra_reverse (struct expr_s *e);
struct expr_s *algebra_cast_expr (struct type_s *dstType, struct expr_s *e);
struct expr_s *algebra_assign_expr (struct expr_s *dst, struct expr_s *src);
struct expr_s *algebra_field_expr (struct expr_s *mvec,
struct expr_s *field_name);
#endif//__algebra_h

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

@ -633,6 +633,8 @@ expr_t *new_entity_expr (int entity_val);
(expr_t::e::field_val).
*/
expr_t *new_field_expr (int field_val, struct type_s *type, struct def_s *def);
struct symbol_s *get_struct_field (const struct type_s *t1, expr_t *e1,
expr_t *e2);
/** Create a new function constant expression node.

4
tools/qfcc/source/algebra.c
View file

@ -111,9 +111,9 @@ static const char *mvec_3d_names[] = {
static const char *mvec_4d_names[] = {
"vec",
"bvecv",
"bvect",
"scalar",
"bvecm",
"bvecp",
"qvec",
"tvec",
0

4
tools/qfcc/source/expr.c
View file

@ -1463,7 +1463,7 @@ prepend_expr (expr_t *block, expr_t *e)
return block;
}
static symbol_t *
symbol_t *
get_struct_field (const type_t *t1, expr_t *e1, expr_t *e2)
{
symtab_t *strct = 0;
@ -1587,6 +1587,8 @@ field_expr (expr_t *e1, expr_t *e2)
return new_offset_alias_expr (field->type, e1, field->s.offset);
}
}
} else if (is_algebra (t1)) {
return algebra_field_expr (e1, e2);
} else if (is_class (t1)) {
//Class instance variables aren't allowed and thus declaring one
//is treated as an error, so this is a follow-on error.

17
tools/qfcc/source/expr_algebra.c
View file

@ -2242,3 +2242,20 @@ algebra_assign_expr (expr_t *dst, expr_t *src)
}
return block;
}
expr_t *
algebra_field_expr (expr_t *mvec, expr_t *field_name)
{
auto mvec_type = get_type (mvec);
auto algebra = algebra_get (mvec_type);
if (mvec_type->type == ev_invalid) {
auto mvec_struct = algebra->mvec_sym->type;
auto field = get_struct_field (mvec_struct, mvec, field_name);
if (!field) {
return mvec;
}
return new_offset_alias_expr (field->type, mvec, field->s.offset);
}
internal_error (mvec, "not implemented");
}

5
tools/qfcc/test/algtypes.r
View file

@ -48,5 +48,10 @@ main (void)
pga2 = (l1 • p)*l1;
}
printf ("%q\n", plane);
printf ("%g\n", pgaf1.scalar);
printf ("%q\n", pgaf1.vec);
printf ("%v %v\n", pgaf1.bvect, pgaf1.bvecp);
printf ("%q\n", pgaf1.tvec);
printf ("%g\n", (float)pgaf1.qvec);
return 0; // to survive and prevail :)
}