2013-07-28 22:08:34 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
// Implementation of our Request class; a request is a user-created thing
|
|
|
|
|
// that will generate an entity (line, curve) when the sketch is generated,
|
|
|
|
|
// in the same way that other entities are generated automatically, like
|
|
|
|
|
// by an extrude or a step and repeat.
|
|
|
|
|
//
|
|
|
|
|
// Copyright 2008-2013 Jonathan Westhues.
|
|
|
|
|
//-----------------------------------------------------------------------------
|
2008-06-06 08:14:37 +00:00
|
|
|
#include "solvespace.h"
|
|
|
|
|
|
|
|
|
|
const hRequest Request::HREQUEST_REFERENCE_XY = { 1 };
|
|
|
|
|
const hRequest Request::HREQUEST_REFERENCE_YZ = { 2 };
|
|
|
|
|
const hRequest Request::HREQUEST_REFERENCE_ZX = { 3 };
|
|
|
|
|
|
2016-05-25 08:47:08 +00:00
|
|
|
struct EntReqMapping {
|
|
|
|
|
Request::Type reqType;
|
|
|
|
|
Entity::Type entType;
|
|
|
|
|
int points;
|
|
|
|
|
bool useExtraPoints;
|
|
|
|
|
bool hasNormal;
|
|
|
|
|
bool hasDistance;
|
|
|
|
|
};
|
|
|
|
|
static const EntReqMapping EntReqMap[] = {
|
|
|
|
|
// request type entity type pts xtra? norml dist
|
|
|
|
|
{ Request::Type::WORKPLANE, Entity::Type::WORKPLANE, 1, false, true, false },
|
|
|
|
|
{ Request::Type::DATUM_POINT, (Entity::Type)0, 1, false, false, false },
|
|
|
|
|
{ Request::Type::LINE_SEGMENT, Entity::Type::LINE_SEGMENT, 2, false, false, false },
|
|
|
|
|
{ Request::Type::CUBIC, Entity::Type::CUBIC, 4, true, false, false },
|
|
|
|
|
{ Request::Type::CUBIC_PERIODIC, Entity::Type::CUBIC_PERIODIC, 3, true, false, false },
|
|
|
|
|
{ Request::Type::CIRCLE, Entity::Type::CIRCLE, 1, false, true, true },
|
|
|
|
|
{ Request::Type::ARC_OF_CIRCLE, Entity::Type::ARC_OF_CIRCLE, 3, false, true, false },
|
2016-10-11 01:58:04 +00:00
|
|
|
{ Request::Type::TTF_TEXT, Entity::Type::TTF_TEXT, 4, false, true, false },
|
2016-11-29 16:49:20 +00:00
|
|
|
{ Request::Type::IMAGE, Entity::Type::IMAGE, 4, false, true, false },
|
2009-10-22 14:02:08 +00:00
|
|
|
};
|
|
|
|
|
|
2016-05-25 08:47:08 +00:00
|
|
|
static void CopyEntityInfo(const EntReqMapping *te, int extraPoints,
|
|
|
|
|
Entity::Type *ent, Request::Type *req,
|
|
|
|
|
int *pts, bool *hasNormal, bool *hasDistance)
|
2009-10-22 14:02:08 +00:00
|
|
|
{
|
|
|
|
|
int points = te->points;
|
|
|
|
|
if(te->useExtraPoints) points += extraPoints;
|
|
|
|
|
|
|
|
|
|
if(ent) *ent = te->entType;
|
|
|
|
|
if(req) *req = te->reqType;
|
|
|
|
|
if(pts) *pts = points;
|
|
|
|
|
if(hasNormal) *hasNormal = te->hasNormal;
|
|
|
|
|
if(hasDistance) *hasDistance = te->hasDistance;
|
|
|
|
|
}
|
|
|
|
|
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
bool EntReqTable::GetRequestInfo(Request::Type req, int extraPoints,
|
2016-05-25 08:47:08 +00:00
|
|
|
Entity::Type *ent, int *pts, bool *hasNormal, bool *hasDistance)
|
2009-10-22 14:02:08 +00:00
|
|
|
{
|
2016-05-25 08:47:08 +00:00
|
|
|
for(const EntReqMapping &te : EntReqMap) {
|
|
|
|
|
if(req == te.reqType) {
|
|
|
|
|
CopyEntityInfo(&te, extraPoints, ent, NULL, pts, hasNormal, hasDistance);
|
2009-12-04 08:08:41 +00:00
|
|
|
return true;
|
2009-10-22 14:02:08 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-12-04 08:08:41 +00:00
|
|
|
return false;
|
2009-10-22 14:02:08 +00:00
|
|
|
}
|
|
|
|
|
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
bool EntReqTable::GetEntityInfo(Entity::Type ent, int extraPoints,
|
2016-05-25 08:47:08 +00:00
|
|
|
Request::Type *req, int *pts, bool *hasNormal, bool *hasDistance)
|
2009-10-22 14:02:08 +00:00
|
|
|
{
|
2016-05-25 08:47:08 +00:00
|
|
|
for(const EntReqMapping &te : EntReqMap) {
|
|
|
|
|
if(ent == te.entType) {
|
|
|
|
|
CopyEntityInfo(&te, extraPoints, NULL, req, pts, hasNormal, hasDistance);
|
2009-12-04 08:08:41 +00:00
|
|
|
return true;
|
2009-10-22 14:02:08 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-12-04 08:08:41 +00:00
|
|
|
return false;
|
2009-10-22 14:02:08 +00:00
|
|
|
}
|
|
|
|
|
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
Request::Type EntReqTable::GetRequestForEntity(Entity::Type ent) {
|
Enable exhaustive switch coverage warnings as an error, and use them.
Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC
equivalent; the exact way it is handled varies slightly, but what
they all have in common is that in a switch statement over an
enumeration, any enumerand that is not explicitly (via case:) or
implicitly (via default:) handled in the switch triggers an error.
Moreover, we also change the switch statements in three ways:
* Switch statements that ought to be extended every time a new
enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed
to explicitly list every single enumerand, and not have a
default: branch.
Note that the assertions are kept because it is legal for
a enumeration to have a value unlike any of its defined
enumerands, and we can e.g. read garbage from a file, or
an uninitialized variable. This requires some rearranging if
a default: branch is undesired.
* Switch statements that ought to only ever see a few select
enumerands, are changed to always assert in the default: branch.
* Switch statements that do something meaningful for a few
enumerands, and ignore everything else, are changed to do nothing
in a default: branch, under the assumption that changing them
every time an enumerand is added or removed would just result
in noise and catch no bugs.
This commit also removes the {Request,Entity,Constraint}::UNKNOWN and
Entity::DATUM_POINT enumerands, as those were just fancy names for
zeroes. They mess up switch exhaustiveness checks and most of the time
were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
|
|
|
Request::Type req;
|
|
|
|
|
ssassert(GetEntityInfo(ent, 0, &req, NULL, NULL, NULL),
|
|
|
|
|
"No entity for request");
|
2009-10-22 14:02:08 +00:00
|
|
|
return req;
|
|
|
|
|
}
|
|
|
|
|
|
2008-06-06 08:14:37 +00:00
|
|
|
void Request::Generate(IdList<Entity,hEntity> *entity,
|
2016-10-11 01:58:04 +00:00
|
|
|
IdList<Param,hParam> *param)
|
2008-06-06 08:14:37 +00:00
|
|
|
{
|
|
|
|
|
int points = 0;
|
2016-11-17 13:57:31 +00:00
|
|
|
Entity::Type et = (Entity::Type)0;
|
2008-06-06 08:14:37 +00:00
|
|
|
bool hasNormal = false;
|
|
|
|
|
bool hasDistance = false;
|
|
|
|
|
int i;
|
|
|
|
|
|
2016-10-11 01:58:04 +00:00
|
|
|
// Request-specific generation.
|
|
|
|
|
switch(type) {
|
|
|
|
|
case Type::TTF_TEXT: {
|
|
|
|
|
double actualAspectRatio = SS.fonts.AspectRatio(font, str);
|
|
|
|
|
if(EXACT(actualAspectRatio != 0.0)) {
|
|
|
|
|
// We could load the font, so use the actual value.
|
|
|
|
|
aspectRatio = actualAspectRatio;
|
|
|
|
|
}
|
|
|
|
|
if(EXACT(aspectRatio == 0.0)) {
|
|
|
|
|
// We couldn't load the font and we don't have anything saved,
|
|
|
|
|
// so just use 1:1, which is valid for the missing font symbol anyhow.
|
|
|
|
|
aspectRatio = 1.0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-29 16:49:20 +00:00
|
|
|
case Type::IMAGE: {
|
|
|
|
|
auto image = SS.images.find(file);
|
|
|
|
|
if(image != SS.images.end()) {
|
|
|
|
|
std::shared_ptr<Pixmap> pixmap = (*image).second;
|
|
|
|
|
if(pixmap != NULL) {
|
|
|
|
|
aspectRatio = (double)pixmap->width / (double)pixmap->height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(EXACT(aspectRatio == 0.0)) {
|
|
|
|
|
aspectRatio = 1.0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-11 01:58:04 +00:00
|
|
|
default: // most requests don't do anything else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-27 15:31:23 +00:00
|
|
|
Entity e = {};
|
Enable exhaustive switch coverage warnings as an error, and use them.
Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC
equivalent; the exact way it is handled varies slightly, but what
they all have in common is that in a switch statement over an
enumeration, any enumerand that is not explicitly (via case:) or
implicitly (via default:) handled in the switch triggers an error.
Moreover, we also change the switch statements in three ways:
* Switch statements that ought to be extended every time a new
enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed
to explicitly list every single enumerand, and not have a
default: branch.
Note that the assertions are kept because it is legal for
a enumeration to have a value unlike any of its defined
enumerands, and we can e.g. read garbage from a file, or
an uninitialized variable. This requires some rearranging if
a default: branch is undesired.
* Switch statements that ought to only ever see a few select
enumerands, are changed to always assert in the default: branch.
* Switch statements that do something meaningful for a few
enumerands, and ignore everything else, are changed to do nothing
in a default: branch, under the assumption that changing them
every time an enumerand is added or removed would just result
in noise and catch no bugs.
This commit also removes the {Request,Entity,Constraint}::UNKNOWN and
Entity::DATUM_POINT enumerands, as those were just fancy names for
zeroes. They mess up switch exhaustiveness checks and most of the time
were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
|
|
|
EntReqTable::GetRequestInfo(type, extraPoints, &et, &points, &hasNormal, &hasDistance);
|
2008-06-06 08:14:37 +00:00
|
|
|
|
|
|
|
|
// Generate the entity that's specific to this request.
|
|
|
|
|
e.type = et;
|
2009-10-21 04:46:01 +00:00
|
|
|
e.extraPoints = extraPoints;
|
2008-06-06 08:14:37 +00:00
|
|
|
e.group = group;
|
2009-09-18 08:14:15 +00:00
|
|
|
e.style = style;
|
2008-06-06 08:14:37 +00:00
|
|
|
e.workplane = workplane;
|
|
|
|
|
e.construction = construction;
|
2015-11-06 08:40:12 +00:00
|
|
|
e.str = str;
|
|
|
|
|
e.font = font;
|
2016-11-29 16:49:20 +00:00
|
|
|
e.file = file;
|
2016-10-11 01:58:04 +00:00
|
|
|
e.aspectRatio = aspectRatio;
|
2008-06-06 08:14:37 +00:00
|
|
|
e.h = h.entity(0);
|
|
|
|
|
|
|
|
|
|
// And generate entities for the points
|
|
|
|
|
for(i = 0; i < points; i++) {
|
2015-03-27 15:31:23 +00:00
|
|
|
Entity p = {};
|
2008-06-06 08:14:37 +00:00
|
|
|
p.workplane = workplane;
|
|
|
|
|
// points start from entity 1, except for datum point case
|
Enable exhaustive switch coverage warnings as an error, and use them.
Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC
equivalent; the exact way it is handled varies slightly, but what
they all have in common is that in a switch statement over an
enumeration, any enumerand that is not explicitly (via case:) or
implicitly (via default:) handled in the switch triggers an error.
Moreover, we also change the switch statements in three ways:
* Switch statements that ought to be extended every time a new
enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed
to explicitly list every single enumerand, and not have a
default: branch.
Note that the assertions are kept because it is legal for
a enumeration to have a value unlike any of its defined
enumerands, and we can e.g. read garbage from a file, or
an uninitialized variable. This requires some rearranging if
a default: branch is undesired.
* Switch statements that ought to only ever see a few select
enumerands, are changed to always assert in the default: branch.
* Switch statements that do something meaningful for a few
enumerands, and ignore everything else, are changed to do nothing
in a default: branch, under the assumption that changing them
every time an enumerand is added or removed would just result
in noise and catch no bugs.
This commit also removes the {Request,Entity,Constraint}::UNKNOWN and
Entity::DATUM_POINT enumerands, as those were just fancy names for
zeroes. They mess up switch exhaustiveness checks and most of the time
were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
|
|
|
p.h = h.entity(i+((et != (Entity::Type)0) ? 1 : 0));
|
2008-06-06 08:14:37 +00:00
|
|
|
p.group = group;
|
2009-09-18 08:14:15 +00:00
|
|
|
p.style = style;
|
2019-05-23 16:06:24 +00:00
|
|
|
p.construction = e.construction;
|
2008-06-06 08:14:37 +00:00
|
|
|
if(workplane.v == Entity::FREE_IN_3D.v) {
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
p.type = Entity::Type::POINT_IN_3D;
|
2008-06-06 08:14:37 +00:00
|
|
|
// params for x y z
|
|
|
|
|
p.param[0] = AddParam(param, h.param(16 + 3*i + 0));
|
|
|
|
|
p.param[1] = AddParam(param, h.param(16 + 3*i + 1));
|
|
|
|
|
p.param[2] = AddParam(param, h.param(16 + 3*i + 2));
|
|
|
|
|
} else {
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
p.type = Entity::Type::POINT_IN_2D;
|
2008-06-06 08:14:37 +00:00
|
|
|
// params for u v
|
|
|
|
|
p.param[0] = AddParam(param, h.param(16 + 3*i + 0));
|
|
|
|
|
p.param[1] = AddParam(param, h.param(16 + 3*i + 1));
|
|
|
|
|
}
|
|
|
|
|
entity->Add(&p);
|
|
|
|
|
e.point[i] = p.h;
|
|
|
|
|
}
|
|
|
|
|
if(hasNormal) {
|
2015-03-27 15:31:23 +00:00
|
|
|
Entity n = {};
|
2008-06-06 08:14:37 +00:00
|
|
|
n.workplane = workplane;
|
|
|
|
|
n.h = h.entity(32);
|
|
|
|
|
n.group = group;
|
2009-09-18 08:14:15 +00:00
|
|
|
n.style = style;
|
2019-05-23 16:06:24 +00:00
|
|
|
n.construction = e.construction;
|
2008-06-06 08:14:37 +00:00
|
|
|
if(workplane.v == Entity::FREE_IN_3D.v) {
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
n.type = Entity::Type::NORMAL_IN_3D;
|
2008-06-06 08:14:37 +00:00
|
|
|
n.param[0] = AddParam(param, h.param(32+0));
|
|
|
|
|
n.param[1] = AddParam(param, h.param(32+1));
|
|
|
|
|
n.param[2] = AddParam(param, h.param(32+2));
|
|
|
|
|
n.param[3] = AddParam(param, h.param(32+3));
|
|
|
|
|
} else {
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
n.type = Entity::Type::NORMAL_IN_2D;
|
2008-06-06 08:14:37 +00:00
|
|
|
// and this is just a copy of the workplane quaternion,
|
|
|
|
|
// so no params required
|
|
|
|
|
}
|
2016-05-18 22:51:36 +00:00
|
|
|
ssassert(points >= 1, "Positioning a normal requires a point");
|
2008-06-06 08:14:37 +00:00
|
|
|
// The point determines where the normal gets displayed on-screen;
|
|
|
|
|
// it's entirely cosmetic.
|
|
|
|
|
n.point[0] = e.point[0];
|
|
|
|
|
entity->Add(&n);
|
|
|
|
|
e.normal = n.h;
|
|
|
|
|
}
|
|
|
|
|
if(hasDistance) {
|
2015-03-27 15:31:23 +00:00
|
|
|
Entity d = {};
|
2008-06-06 08:14:37 +00:00
|
|
|
d.workplane = workplane;
|
|
|
|
|
d.h = h.entity(64);
|
|
|
|
|
d.group = group;
|
2009-09-18 08:14:15 +00:00
|
|
|
d.style = style;
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
d.type = Entity::Type::DISTANCE;
|
2008-06-06 08:14:37 +00:00
|
|
|
d.param[0] = AddParam(param, h.param(64));
|
|
|
|
|
entity->Add(&d);
|
|
|
|
|
e.distance = d.h;
|
|
|
|
|
}
|
|
|
|
|
|
Enable exhaustive switch coverage warnings as an error, and use them.
Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC
equivalent; the exact way it is handled varies slightly, but what
they all have in common is that in a switch statement over an
enumeration, any enumerand that is not explicitly (via case:) or
implicitly (via default:) handled in the switch triggers an error.
Moreover, we also change the switch statements in three ways:
* Switch statements that ought to be extended every time a new
enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed
to explicitly list every single enumerand, and not have a
default: branch.
Note that the assertions are kept because it is legal for
a enumeration to have a value unlike any of its defined
enumerands, and we can e.g. read garbage from a file, or
an uninitialized variable. This requires some rearranging if
a default: branch is undesired.
* Switch statements that ought to only ever see a few select
enumerands, are changed to always assert in the default: branch.
* Switch statements that do something meaningful for a few
enumerands, and ignore everything else, are changed to do nothing
in a default: branch, under the assumption that changing them
every time an enumerand is added or removed would just result
in noise and catch no bugs.
This commit also removes the {Request,Entity,Constraint}::UNKNOWN and
Entity::DATUM_POINT enumerands, as those were just fancy names for
zeroes. They mess up switch exhaustiveness checks and most of the time
were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
|
|
|
if(et != (Entity::Type)0) entity->Add(&e);
|
2008-06-06 08:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
2016-05-21 05:18:00 +00:00
|
|
|
std::string Request::DescriptionString() const {
|
2016-11-17 13:57:31 +00:00
|
|
|
const char *s = "";
|
2008-06-06 08:14:37 +00:00
|
|
|
if(h.v == Request::HREQUEST_REFERENCE_XY.v) {
|
|
|
|
|
s = "#XY";
|
|
|
|
|
} else if(h.v == Request::HREQUEST_REFERENCE_YZ.v) {
|
|
|
|
|
s = "#YZ";
|
|
|
|
|
} else if(h.v == Request::HREQUEST_REFERENCE_ZX.v) {
|
|
|
|
|
s = "#ZX";
|
|
|
|
|
} else {
|
2016-05-25 08:47:08 +00:00
|
|
|
switch(type) {
|
|
|
|
|
case Type::WORKPLANE: s = "workplane"; break;
|
|
|
|
|
case Type::DATUM_POINT: s = "datum-point"; break;
|
|
|
|
|
case Type::LINE_SEGMENT: s = "line-segment"; break;
|
|
|
|
|
case Type::CUBIC: s = "cubic-bezier"; break;
|
|
|
|
|
case Type::CUBIC_PERIODIC: s = "periodic-cubic"; break;
|
|
|
|
|
case Type::CIRCLE: s = "circle"; break;
|
2016-11-29 16:49:20 +00:00
|
|
|
case Type::ARC_OF_CIRCLE: s = "arc-of-circle"; break;
|
2016-05-25 08:47:08 +00:00
|
|
|
case Type::TTF_TEXT: s = "ttf-text"; break;
|
2016-11-29 16:49:20 +00:00
|
|
|
case Type::IMAGE: s = "image"; break;
|
2016-05-25 08:47:08 +00:00
|
|
|
}
|
2008-06-06 08:14:37 +00:00
|
|
|
}
|
2016-05-25 08:47:08 +00:00
|
|
|
ssassert(s != NULL, "Unexpected request type");
|
2015-11-06 08:40:12 +00:00
|
|
|
return ssprintf("r%03x-%s", h.v, s);
|
2008-06-06 08:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
2016-05-21 05:18:00 +00:00
|
|
|
int Request::IndexOfPoint(hEntity he) const {
|
Convert all enumerations to use `enum class`.
Specifically, take the old code that looks like this:
class Foo {
enum { X = 1, Y = 2 };
int kind;
}
... foo.kind = Foo::X; ...
and convert it to this:
class Foo {
enum class Kind : uint32_t { X = 1, Y = 2 };
Kind kind;
}
... foo.kind = Foo::Kind::X;
(In some cases the enumeration would not be in the class namespace,
such as when it is generally useful.)
The benefits are as follows:
* The type of the field gives a clear indication of intent, both
to humans and tools (such as binding generators).
* The compiler is able to automatically warn when a switch is not
exhaustive; but this is currently suppressed by the
default: ssassert(false, ...)
idiom.
* Integers and plain enums are weakly type checked: they implicitly
convert into each other. This can hide bugs where type conversion
is performed but not intended. Enum classes are strongly type
checked.
* Plain enums pollute parent namespaces; enum classes do not.
Almost every defined enum we have already has a kind of ad-hoc
namespacing via `NAMESPACE_`, which is now explicit.
* Plain enums do not have a well-defined ABI size, which is
important for bindings. Enum classes can have it, if specified.
We specify the base type for all enums as uint32_t, which is
a safe choice and allows us to not change the numeric values
of any variants.
This commit introduces absolutely no functional change to the code,
just renaming and change of types. It handles almost all cases,
except GraphicsWindow::pending.operation, which needs minor
functional change.
2016-05-20 08:31:20 +00:00
|
|
|
if(type == Type::DATUM_POINT) {
|
2016-04-07 14:44:56 +00:00
|
|
|
return (he.v == h.entity(0).v) ? 0 : -1;
|
|
|
|
|
}
|
|
|
|
|
for(int i = 0; i < MAX_POINTS_IN_ENTITY; i++) {
|
|
|
|
|
if(he.v == h.entity(i + 1).v) {
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2008-06-06 08:14:37 +00:00
|
|
|
hParam Request::AddParam(IdList<Param,hParam> *param, hParam hp) {
|
2015-03-27 15:31:23 +00:00
|
|
|
Param pa = {};
|
2008-06-06 08:14:37 +00:00
|
|
|
pa.h = hp;
|
|
|
|
|
param->Add(&pa);
|
|
|
|
|
return hp;
|
|
|
|
|
}
|
|
|
|
|
|
