FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Minor refactoring of surface curve data into its own struct by iscgar · Pull Request #1536 · solvespace/solvespace · GitHub

/ solvespace Public

Minor refactoring of surface curve data into its own struct #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iscgar wants to merge 3 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 10 Commits 3 Checks 0 Files changed
Open

Minor refactoring of surface curve data into its own struct #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
258c669
surface: refactor the curve data into its own struct
Feb 25, 2025
e829c8a
Revert "surface: refactor the curve data into its own struct"
Feb 26, 2025
a27d2bd
surface: avoid copying the entire surface when we only need some of it
Feb 26, 2025
File filter

Filter by extension

Filter by extension .cpp  (2) .h  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
16 changes: 10 additions & 6 deletions src/srf/raycast.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,18 @@ void SSurface::BlendRowOrCol(bool row, int this_ij, SSurface *a, int a_ij,
}
}
}
void SSurface::SplitInHalf(bool byU, SSurface *sa, SSurface *sb) {
sa->degm = sb->degm = degm;
sa->degn = sb->degn = degn;

void SSurface::SplitInHalf(bool byU, SSurface *sa, SSurface *sb) const {
// by de Casteljau's algorithm in a projective space; so we must work
// on points (w*x, w*y, w*z, w) so create a temporary copy
SSurface st;
st = *this;
SSurface st = {};

// Only copy the data we need into the new object
memcpy(st.ctrl, ctrl, sizeof(ctrl));
memcpy(st.weight, weight, sizeof(weight));

st.degm = sa->degm = sb->degm = degm;
st.degn = sa->degn = sb->degn = degn;

st.WeightControlPoints();

switch(byU ? degm : degn) {
Expand Down
25 changes: 15 additions & 10 deletions src/srf/shell.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -524,21 +524,26 @@ void SShell::MakeFirstOrderRevolvedSurfaces(Vector pt, Vector axis, int i0) {
if(fabs(d0 - d1) < LENGTH_EPS) {
// This is a cylinder; so transpose it so that we'll recognize
// it as a surface of extrusion.
SSurface sn = *srf;

// Transposing u and v flips the normal, so reverse u to
// flip it again and put it back where we started.
sn.degm = 2;
sn.degn = 1;
int dm, dn;
for(dm = 0; dm <= 1; dm++) {
for(dn = 0; dn <= 2; dn++) {
sn.ctrl [dn][dm] = srf->ctrl [1-dm][dn];
sn.weight[dn][dm] = srf->weight[1-dm][dn];
// flip it again and put it back where we started (work on
// a copy and copy back the result in order to make the loop
// simpler).
decltype(SSurface::ctrl) ctrl = {};
decltype(SSurface::weight) weight = {};

srf->degm = 2;
srf->degn = 1;
for(int dm = 0; dm <= 1; dm++) {
for(int dn = 0; dn <= 2; dn++) {
ctrl [dn][dm] = srf->ctrl [1-dm][dn];
weight[dn][dm] = srf->weight[1-dm][dn];
}
}

*srf = sn;
// Copy back the transposed data
memcpy(srf->ctrl, ctrl, sizeof(ctrl));
memcpy(srf->weight, weight, sizeof(weight));
continue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/srf/surface.h
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ class SSurface {
void BlendRowOrCol(bool row, int this_ij, SSurface *a, int a_ij,
SSurface *b, int b_ij);
double DepartureFromCoplanar() const;
void SplitInHalf(bool byU, SSurface *sa, SSurface *sb);
void SplitInHalf(bool byU, SSurface *sa, SSurface *sb) const;
void AllPointsIntersecting(Vector a, Vector b,
List<SInter> *l,
bool asSegment, bool trimmed, bool inclTangent);
Expand Down
Back | FazBrowse Home | New Git URL