zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
solvespace/Makefile

95 lines
3.1 KiB
Makefile
Raw Normal View History

Add hyperlink and colour support to the text window. Don't redraw the text window every time we refresh the graphics window, because that's slow. Use classes instead of structs for everything; I don't understand the template handling for structs. And implement the IdList, which I will try to use in many places. [git-p4: depot-paths = "//depot/solvespace/": change = 1655]
2008-03-28 10:00:37 +00:00
DEFINES = /D_WIN32_WINNT=0x500 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x500 /DWIN32_LEAN_AND_MEAN /DWIN32
Add sweeps. The user specifies a trajectory and a section, in two separate groups. The section is swept normal to the trajectory, producing a mesh. I'm doing the triangles only now, not copying over any entities. Also fix a bug in the PNG export; rows are 4-aligned, so that was breaking when the width of the image wasn't divisible by four. Also fix a bug in lathes, where it generated overlapping triangles for one segment. And change the groups to record both "this mesh", the contribution due to the extrude/lathe/whatever, and the "running mesh", that we get after applying the requested Boolean op between "this mesh" and the previous group's "running mesh". I'll use that to make step and repeats step the mesh too. [git-p4: depot-paths = "//depot/solvespace/": change = 1801]
2008-06-21 10:18:20 +00:00
# Use the multi-threaded static libc because libpng and zlib do; not sure if anything bad
# happens if those mix, but don't want to risk it.
CFLAGS = /W3 /nologo -MT -Iextlib -I..\common\win32 /D_DEBUG /D_CRT_SECURE_NO_WARNINGS /I. /Zi /EHs
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
HEADERS = ..\common\win32\freeze.h ui.h solvespace.h dsc.h sketch.h expr.h polygon.h srf\surface.h
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
OBJDIR = obj
FREEZE = $(OBJDIR)\freeze.obj
W32OBJS = $(OBJDIR)\w32main.obj \
The constraint solver now compiles as a library, and I have a little test app that links against it. I still need to polish a few things, but this is more or less as it should be. [git-p4: depot-paths = "//depot/solvespace/": change = 1944]
2009-04-20 07:30:09 +00:00
$(OBJDIR)\w32util.obj \
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
SSOBJS = $(OBJDIR)\solvespace.obj \
Rename cmdline.cpp to textwin.cpp, since it no longer has a command line. [git-p4: depot-paths = "//depot/solvespace/": change = 1666]
2008-04-13 10:58:22 +00:00
$(OBJDIR)\textwin.obj \
Split the BSP stuff off the mesh stuff, and the text screens themselves of the text window utility functions. [git-p4: depot-paths = "//depot/solvespace/": change = 1806]
2008-06-23 08:37:12 +00:00
$(OBJDIR)\textscreens.obj \
More fragments of SolveSpace work. Improve the command line window, and add some (non-functional) menus to the graphics window. Start to rough in some data structures to hold the sketch. No real work yet, though. [git-p4: depot-paths = "//depot/solvespace/": change = 1653]
2008-03-26 09:18:12 +00:00
$(OBJDIR)\graphicswin.obj \
Add a trim command. I can now do circles (or arcs) against lines, or lines against lines. The constraints get rather screwed up afterwards, of course. So make arcs with the endpoints coincident into circles, instead of nothings; since the first split of a circle produces that. And don't warn after deleting just point-coincident or horiz/vert constraints as a dependency; that's just a nuisance, because it happens too often. [git-p4: depot-paths = "//depot/solvespace/": change = 1884]
2009-01-03 12:27:33 +00:00
$(OBJDIR)\modify.obj \
Start to add OpenGL support to SolveSpace, for the graphical view. I've got the user interface to pan and rotate an object, more or less works. [git-p4: depot-paths = "//depot/solvespace/": change = 1654]
2008-03-27 09:53:51 +00:00
$(OBJDIR)\util.obj \
Change how step and repeat works: now I build the union of all the steps in thisShell or thisMesh, and then let the Boolean proceed as usual. If everything works, then this is equivalent. And it's less code, and it makes stuff like stepping the step and repeat work. Also begin to work on line/entity/constraint styles, but no real work yet. [git-p4: depot-paths = "//depot/solvespace/": change = 2018]
2009-07-20 01:47:59 +00:00
$(OBJDIR)\style.obj \
Bits and pieces of SolveSpace; zoom works now, and some stuff to draw planes that I will use to do the datum planes. Still haven't settled upon the request/entity/group structure, and that's the dependency before doing much real. [git-p4: depot-paths = "//depot/solvespace/": change = 1656]
2008-04-01 10:48:44 +00:00
$(OBJDIR)\entity.obj \
Split some large files. [git-p4: depot-paths = "//depot/solvespace/": change = 1777]
2008-06-06 08:14:37 +00:00
$(OBJDIR)\drawentity.obj \
$(OBJDIR)\group.obj \
$(OBJDIR)\groupmesh.obj \
$(OBJDIR)\request.obj \
Add routines to draw a vector font (public domain Hershey Simplex font, not bad). Use that to label the planes now. [git-p4: depot-paths = "//depot/solvespace/": change = 1660]
2008-04-11 11:13:47 +00:00
$(OBJDIR)\glhelper.obj \
Make the points locked in 2d csys (expressed as two parameters, for the plane basis vectors) work, easy. Tweak the text window a bit, for cosmetics, and start to add the symbolic expression code. [git-p4: depot-paths = "//depot/solvespace/": change = 1667]
2008-04-13 14:28:35 +00:00
$(OBJDIR)\expr.obj \
Now I can add a constraint (a length), and it's displayed on-screen, and I can drag the label. That's progress. Also implement a bunch of untested expression stuff, since I'll need that for the values of the dimensions, for example. [git-p4: depot-paths = "//depot/solvespace/": change = 1668]
2008-04-14 10:28:32 +00:00
$(OBJDIR)\constraint.obj \
Split constraint.cpp into two files: one for building the constraint structures based on user input, and one for generating equations from the constraints. [git-p4: depot-paths = "//depot/solvespace/": change = 1885]
2009-01-03 12:31:19 +00:00
$(OBJDIR)\constrainteq.obj \
Split some large files. [git-p4: depot-paths = "//depot/solvespace/": change = 1777]
2008-06-06 08:14:37 +00:00
$(OBJDIR)\draw.obj \
Add a toolbar. This requires a tool to convert my PNG icons to tables in the code, which I have written in perl and am checking in. Also get WM_MOUSELEAVE events from win32, so that I can de-hover everything when the mouse leaves the graphics window. And fix one of the icons, which was 23x24 instead of 24x24. [git-p4: depot-paths = "//depot/solvespace/": change = 1883]
2009-01-02 10:38:36 +00:00
$(OBJDIR)\toolbar.obj \
Now I can add a constraint (a length), and it's displayed on-screen, and I can drag the label. That's progress. Also implement a bunch of untested expression stuff, since I'll need that for the values of the dimensions, for example. [git-p4: depot-paths = "//depot/solvespace/": change = 1668]
2008-04-14 10:28:32 +00:00
$(OBJDIR)\drawconstraint.obj \
Rename some stuff in the IdList again. Rough in the file save stuff, though no file load stuff, and perhaps this can all be made to work from a table somehow. Move the quaternion stuff into its own class, and add a fancy animated view when you orient onto a csys. [git-p4: depot-paths = "//depot/solvespace/": change = 1672]
2008-04-18 11:11:48 +00:00
$(OBJDIR)\file.obj \
Add undo/redo. This saves the param guesses, constraints, groups, and requests to a separate list. It's messy, because I have to make a deep copy (e.g. of the remap list for the groups, or Expr * stuff) of some things. Others (e.g. the polygon or mesh) will be regenerated, so they should be discarded, but they must not get double-freed. In any case, works superficially. And fix a few memory leaks unrelated to this, and remove some dead code. [git-p4: depot-paths = "//depot/solvespace/": change = 1775]
2008-06-04 10:22:30 +00:00
$(OBJDIR)\undoredo.obj \
Ultra-rough beginnings of a solver. Write the constraint equations, take the partial derivatives, and run the Newton's method. This seems to sort of work with a single distance constraint. [git-p4: depot-paths = "//depot/solvespace/": change = 1675]
2008-04-20 11:35:10 +00:00
$(OBJDIR)\system.obj \
Add code to assemble the piecewise linear segments in a group into a polygon, and to fill that polygon. [git-p4: depot-paths = "//depot/solvespace/": change = 1686]
2008-04-25 07:04:09 +00:00
$(OBJDIR)\polygon.obj \
Add polygon triangulation, by cheating. I'm using the gl tesselator for that, and storing the triangles instead of rendering them immediately. Not sure if that's smart; in theory could change from implementation to implementation, but the results look much better than I would get myself. [git-p4: depot-paths = "//depot/solvespace/": change = 1733]
2008-05-22 10:28:28 +00:00
$(OBJDIR)\mesh.obj \
Split the BSP stuff off the mesh stuff, and the text screens themselves of the text window utility functions. [git-p4: depot-paths = "//depot/solvespace/": change = 1806]
2008-06-23 08:37:12 +00:00
$(OBJDIR)\bsp.obj \
Add TrueType font support to SolveSpace. This uses a modified version of the code from SketchFlat, with all arbitrary limits removed. The TTF text is its own entity, and that entity includes the font file basename and the text. That's an extra 128 bytes in the entity, which is around a 50% increase, kind of a shame. It was simple, though. [git-p4: depot-paths = "//depot/solvespace/": change = 1814]
2008-06-30 09:09:17 +00:00
$(OBJDIR)\ttf.obj \
Split solvespace.cpp; leave the file menu and general-purpose stuff where it was, move the export (DXF, PNG, STL) stuff to export.cpp, and move the regen/solve stuff to generate.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 1825]
2008-07-08 07:45:47 +00:00
$(OBJDIR)\generate.obj \
$(OBJDIR)\export.obj \
Split export.cpp; now exportvector.cpp has all the file format specific stuff. [git-p4: depot-paths = "//depot/solvespace/": change = 2014]
2009-07-08 09:44:13 +00:00
$(OBJDIR)\exportvector.obj \
Add beginnings of STEP export, which weren't as horrible as I had feared. Though I don't have rational surfaces or curves going yet, and I don't have the stuff to handle holes or multiple outer contours in a single surface. [git-p4: depot-paths = "//depot/solvespace/": change = 1974]
2009-06-08 06:50:16 +00:00
$(OBJDIR)\exportstep.obj \
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
SRFOBJS = $(OBJDIR)\ratpoly.obj \
Split ratpoly.cpp; now that contains only the mathematical stuff, and curve.cpp and surface.cpp contain the rest. Also get rid of the meshError stuff; will just use the nakedEdges mechanism for that. And I won't run the interference test continuously, have added a menu item for that. [git-p4: depot-paths = "//depot/solvespace/": change = 1934]
2009-03-29 06:05:28 +00:00
$(OBJDIR)\curve.obj \
$(OBJDIR)\surface.obj \
Early attempts at rational polynomial surfaces. I can create one from an extrusion, with piecewise linear trim curves for everything (that are shared, so that they appear only once for the two surfaces that each trims). No Boolean operations on them, and the triangulation is bad, because gl seems to merge collinear edges. So before going further, I seem to need my own triangulation code. I have not had great luck in the past, but I can't live without it now. [git-p4: depot-paths = "//depot/solvespace/": change = 1899]
2009-01-19 10:37:10 +00:00
$(OBJDIR)\triangulate.obj \
Tear everything apart, moving away from meshes and toward shells. Add stubs for functions to perform Booleans, and get rid of mesh stuff, including the kd tree accelerated snap to vertex (which should not be required if the shell triangulation performs as it should). Also check that a sketch is not self-intersecting before extruding it or whatever. This is dead slow, needs n*log(n) implementation. [git-p4: depot-paths = "//depot/solvespace/": change = 1902]
2009-01-23 03:30:30 +00:00
$(OBJDIR)\boolean.obj \
More poking at Booleans; generate the unsplit intersection curves for planes against planes. [git-p4: depot-paths = "//depot/solvespace/": change = 1907]
2009-01-27 07:59:58 +00:00
$(OBJDIR)\surfinter.obj \
Split line-surface intersection and shell raycasting stuff into its own file. [git-p4: depot-paths = "//depot/solvespace/": change = 1992]
2009-06-21 09:14:49 +00:00
$(OBJDIR)\raycast.obj \
Add code to identify planes and cylindrical surfaces from a solid of revolution, and put them in the same form as if they had been draw by an extrusion (so that we can use all the same special case intersection curves). And add code to merge coincident faces into one. That turns out to be more than a cosmetic/efficiency thing, since edge splitting fails at the join between two coincident faces. [git-p4: depot-paths = "//depot/solvespace/": change = 1965]
2009-06-05 05:38:41 +00:00
$(OBJDIR)\merge.obj \
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
Add an icon file (ugly, but at least it's not the default anymore). And add the manifest that gets us visual styles on the controls under Win32. [git-p4: depot-paths = "//depot/solvespace/": change = 1844]
2008-07-18 09:50:52 +00:00
RES = $(OBJDIR)\resource.res
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Add a simple license key: I take the CRC of the license info, plus some magic numbers. This would be trivial to break, but still more difficult than patching the binary to skip the check... [git-p4: depot-paths = "//depot/solvespace/": change = 1853]
2008-02-09 13:52:01 +00:00
LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib opengl32.lib glu32.lib \
Add support for the 3dconnexion six degree of freedom input devices (in my case, a SpaceNavigator). I can transform the view of the part, or transform a part in an assembly. Also fix up mouse wheel input, so that it works even if it comes in chunks of less than 120 units. [git-p4: depot-paths = "//depot/solvespace/": change = 2019]
2009-07-20 19:05:33 +00:00
extlib\libpng.lib extlib\zlib.lib extlib\si\siapp.lib
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
all: $(OBJDIR)/solvespace.exe
@cp $(OBJDIR)/solvespace.exe .
Replace the closed-form solutions for entity-entity splitting with a method that works on the piecewise linear segments, and then refines any intersections that it finds by Newton's method. So now I support cubics too, and circle-circle intersections, and the code is much simpler. [git-p4: depot-paths = "//depot/solvespace/": change = 2012]
2009-07-07 08:21:59 +00:00
solvespace t8.slvs
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
clean:
rm -f obj/*
Early attempts at rational polynomial surfaces. I can create one from an extrusion, with piecewise linear trim curves for everything (that are shared, so that they appear only once for the two surfaces that each trims). No Boolean operations on them, and the triangulation is bad, because gl seems to merge collinear edges. So before going further, I seem to need my own triangulation code. I have not had great luck in the past, but I can't live without it now. [git-p4: depot-paths = "//depot/solvespace/": change = 1899]
2009-01-19 10:37:10 +00:00
$(OBJDIR)/solvespace.exe: $(SRFOBJS) $(SSOBJS) $(W32OBJS) $(FREEZE) $(RES)
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
@$(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/solvespace.exe $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(FREEZE) $(RES) $(LIBS)
Add preliminary lathe (solid of revolution) support. I'm generating just the mesh, no derived entities (but I suppose that I could turn all points into circles). And fix some bugs where equations didn't get unique IDs, and make it possible to lock on to the group's workplane automatically, if you press W while free in 3d with no workplane selected. [git-p4: depot-paths = "//depot/solvespace/": change = 1780]
2008-06-06 11:35:28 +00:00
editbin /nologo /STACK:8388608 $(OBJDIR)/solvespace.exe
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
@echo solvespace.exe
$(SSOBJS): $(@B).cpp $(HEADERS)
@$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(@B).cpp
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
$(SRFOBJS): srf\$(@B).cpp $(HEADERS)
@$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj srf\$(@B).cpp
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
$(W32OBJS): win32/$(@B).cpp $(HEADERS)
@$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj win32/$(@B).cpp
$(FREEZE): ..\common\win32\$(@B).cpp $(HEADERS)
@$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj ..\common\win32\$(@B).cpp
Add an icon file (ugly, but at least it's not the default anymore). And add the manifest that gets us visual styles on the controls under Win32. [git-p4: depot-paths = "//depot/solvespace/": change = 1844]
2008-07-18 09:50:52 +00:00
$(RES): win32/$(@B).rc icon.ico
rc win32/$(@B).rc
mv win32/$(@B).res $(OBJDIR)/$(@B).res
Add a toolbar. This requires a tool to convert my PNG icons to tables in the code, which I have written in perl and am checking in. Also get WM_MOUSELEAVE events from win32, so that I can de-hover everything when the mouse leaves the graphics window. And fix one of the icons, which was 23x24 instead of 24x24. [git-p4: depot-paths = "//depot/solvespace/": change = 1883]
2009-01-02 10:38:36 +00:00
toolbar.cpp: $(OBJDIR)/icons.h
$(OBJDIR)/icons.h: icons/* png2c.pl
perl png2c.pl > $(OBJDIR)/icons.h