This is my initial checkin for solvespace, a second attempt at

jwesthues · jwesthues · commit 67139236fc0b · 2008-03-25T02:02:13.000-08:00
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]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,36 @@
+DEFINES = /D_WIN32_WINNT=0x400 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x500 /DWIN32_LEAN_AND_MEAN /DWIN32
+CFLAGS  = /W3 /nologo -I..\common\win32 /O2 /D_DEBUG /D_CRT_SECURE_NO_WARNINGS /Zi /I.
+
+HEADERS = ..\common\win32\freeze.h ui.h solvespace.h dsc.h
+
+OBJDIR = obj
+
+FREEZE   = $(OBJDIR)\freeze.obj
+
+W32OBJS  = $(OBJDIR)\w32main.obj \
+
+SSOBJS   = $(OBJDIR)\solvespace.obj \
+           $(OBJDIR)\cmdline.obj \
+
+
+LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib
+
+all: $(OBJDIR)/solvespace.exe
+    @cp $(OBJDIR)/solvespace.exe .
+    solvespace
+
+clean:
+	rm -f obj/*
+
+$(OBJDIR)/solvespace.exe: $(SSOBJS) $(W32OBJS) $(FREEZE)
+    @$(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/solvespace.exe $(SSOBJS) $(W32OBJS) $(FREEZE) $(LIBS)
+    @echo solvespace.exe
+
+$(SSOBJS): $(@B).cpp $(HEADERS)
+    @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(@B).cpp
+
+$(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
diff --git a/cmdline.cpp b/cmdline.cpp
@@ -0,0 +1,85 @@
+#include "solvespace.h"
+#include <stdarg.h>
+
+void TextWindow::Init(void) {
+    int i, j;
+    for(i = 0; i < MAX_ROWS; i++) {
+        for(j = 0; j < MAX_COLS; j++) {
+            text[i][j] = ' ';
+            meta[i][j].color = COLOR_NORMAL;
+            meta[i][j].link = NOT_A_LINK;
+        }
+    }
+    ClearCommand();
+}
+
+void TextWindow::Printf(char *fmt, ...) {
+    va_list vl;
+    va_start(vl, fmt);
+
+    int r, c;
+    if(rows < MAX_ROWS) {
+        r = rows;
+        rows++;
+    } else {
+        r = row0;
+        row0++;
+    }
+    for(c = 0; c < MAX_COLS; c++) {
+        text[r][c] = ' ';
+        meta[r][c].link = NOT_A_LINK;
+    }
+
+    int color = COLOR_NORMAL;
+
+    c = 0;
+    while(*fmt) {
+        if(*fmt == '%') {
+        } else {
+            if(c >= MAX_COLS) goto done;
+            text[r][c++] = *fmt;
+        }
+        fmt++;
+    }
+
+done:
+    va_end(vl);
+}
+
+void TextWindow::ClearCommand(void) {
+    int j;
+    for(j = 0; j < MAX_COLS; j++) {
+        cmd[j] = ' ';
+    }
+    memcpy(cmd, "+> ", 3);
+    cmdLen = 0;
+    cmdInsert = 3;
+    row0 = 0;
+    rows = 0;
+}
+
+void TextWindow::KeyPressed(int c) {
+    if(cmdLen >= MAX_COLS - 10) {
+        ClearCommand();
+        return;
+    }
+
+    if(c == '\n' || c == '\r') {
+        // process the command, and then
+        ClearCommand();
+        return;
+    } else if(c == 27) {
+        ClearCommand();
+    } else if(c == '\b') {
+        // backspace, delete from insertion point
+        if(cmdInsert <= 3) return;
+        memmove(cmd+cmdInsert-1, cmd+cmdInsert, MAX_COLS-cmdInsert);
+        cmdLen--;
+        cmdInsert--;
+    } else {
+        cmd[cmdInsert] = c;
+        cmdInsert++;
+        cmdLen++;
+    }
+}
+
diff --git a/dsc.h b/dsc.h
@@ -0,0 +1,12 @@
+
+#ifndef __DSC_H
+#define __DSC_H
+
+typedef unsigned long DWORD;
+typedef unsigned char BYTE;
+
+typedef struct {
+    double x, y, z;
+} Vector;
+
+#endif
diff --git a/obj/t b/obj/t
diff --git a/solvespace.cpp b/solvespace.cpp
@@ -0,0 +1,11 @@
+#include "solvespace.h"
+
+SolveSpace SS;
+
+void SolveSpace::Init(void) {
+    TW.Init();
+
+    TW.Printf("She walks in beauty");
+    TW.Printf("like the night");
+}
+
diff --git a/solvespace.h b/solvespace.h
@@ -0,0 +1,23 @@
+
+#ifndef __SOLVESPACE_H
+#define __SOLVESPACE_H
+
+#include <stdlib.h>
+#include <string.h>
+#include "dsc.h"
+#include "ui.h"
+
+// Debugging functions
+#define oops() exit(-1)
+void dbp(char *str, ...);
+
+typedef struct {
+    TextWindow      TW;
+    GraphicsWindow  GW;
+
+    void Init(void);
+} SolveSpace;
+
+extern SolveSpace SS;
+
+#endif
diff --git a/ui.h b/ui.h
@@ -0,0 +1,59 @@
+
+#ifndef __UI_H
+#define __UI_H
+
+typedef struct {
+    static const int MAX_COLS = 200;
+    static const int MAX_ROWS = 500;
+
+    // The line with the user-typed command, that is currently being edited.
+    char    cmd[MAX_COLS];
+    int     cmdInsert;
+    int     cmdLen;
+
+    // The rest of the window, text displayed in response to typed commands;
+    // some of this might do something if you click on it.
+
+    static const int NOT_A_LINK = 0;
+
+    static const int COLOR_NORMAL   = 0;
+
+    BYTE    text[MAX_ROWS][MAX_COLS];
+    struct {
+        int     color;
+        int     link;
+        DWORD   data;
+    }       meta[MAX_ROWS][MAX_COLS];
+
+    int row0, rows;
+   
+    void Init(void);
+    void Printf(char *fmt, ...);
+    void ClearScreen(void);
+    
+    void ClearCommand(void);
+
+    // These are called by the platform-specific code.
+    void KeyPressed(int c);
+    bool IsHyperlink(int width, int height);
+} TextWindow;
+
+typedef struct {
+    // These parameters define the map from 2d screen coordinates to the
+    // coordinates of the 3d sketch points. We will use an axonometric
+    // projection.
+    Vector  offset;
+    double  scale;
+    Vector  projRight;
+    Vector  projDown;
+
+    // These are called by the platform-specific code.
+    void Paint(void);
+    void MouseMoved(double x, double y, bool leftDown, bool middleDown,
+                                        bool rightDown);
+    void MouseLeftClick(double x, double y);
+    void MouseLeftDoubleClick(double x, double y);
+    void MouseScroll(int delta);
+} GraphicsWindow;
+
+#endif
diff --git a/win32/w32main.cpp b/win32/w32main.cpp
