mirror of
https://github.com/opus-tango/B12NumbersV3.git
synced 2026-03-20 03:55:20 +00:00
Text updates v1.0.0.2
This commit is contained in:
@@ -1,14 +1,15 @@
|
|||||||
/**
|
/**
|
||||||
* Nayan Sawyer ns9573@bard.edu
|
* Base 12 Toolkit
|
||||||
|
* Nayan Sawyer
|
||||||
* May 21 2022
|
* May 21 2022
|
||||||
* CMSC 141
|
|
||||||
* Final Project: Base 12 Toolkit
|
|
||||||
*
|
*
|
||||||
* Comments/Reflections: The calculator uses B12Expression, MathPad, B12Button, and MathDisplay.
|
* Comments/Reflections: The calculator uses B12Expression, MathPad, B12Button, and MathDisplay.
|
||||||
* The clock app uses Clock, Stopwatch, Timer, and TimeDisplay
|
* The clock app uses Clock, Stopwatch, Timer, and TimeDisplay
|
||||||
*
|
*
|
||||||
* Collaboration Statement: I used the processing docs, method relay code by Quark - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html
|
* This project uses method relay code by Quark that has been modified
|
||||||
* and the exp4j library see - https://www.objecthunter.net/exp4j/index.html
|
* - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html for the source code
|
||||||
|
* This project uses the exp4j library unmodified, which is available under the Apache 2.0 license
|
||||||
|
* - see https://www.objecthunter.net/exp4j/index.html
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import net.objecthunter.exp4j.*; // Math expression evaluation library
|
import net.objecthunter.exp4j.*; // Math expression evaluation library
|
||||||
|
|||||||
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
B12NumbersV3
|
|
||||||
Beta version of a clock in base 12.
|
|
||||||
by Nayan Sawyer
|
|
||||||
started Mar 2022
|
|
||||||
version 0.1.4.3 April 30 2022
|
|
||||||
|
|
||||||
Characters are a variation of Kaktovik Inupiaq numerals
|
|
||||||
reversed and in base 12 instead of 20. I take no credit
|
|
||||||
for the design.
|
|
||||||
Includes method relay code be Quark - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html
|
|
||||||
for more details.
|
|
||||||
|
|
||||||
changelog 0.1.4.0
|
|
||||||
- Added MethodRelay code from Quark. Some fixes and
|
|
||||||
changes as well. Condesed some things into fewer files
|
|
||||||
for so the ide is easier to use, but they will be moved
|
|
||||||
back into their own files as version 1.0 approaches.
|
|
||||||
Everything is prep for adding gui elements (MethodRelay
|
|
||||||
included)
|
|
||||||
|
|
||||||
changelog 0.1.3
|
|
||||||
- Deprecated B12Char by rolling it's code into B12Digit.
|
|
||||||
Makes for easier to handle arrays, and will hopefully
|
|
||||||
make implementing the math functionality much easier.
|
|
||||||
It appears that only Clock may need true refactoring to
|
|
||||||
make the most of this change. B12Int and B12Float seem
|
|
||||||
to be fine with simply swithing out the reference.
|
|
||||||
*/
|
|
||||||
|
|
||||||
float scale = 2;
|
|
||||||
PVector offset;
|
|
||||||
float sMouseX;
|
|
||||||
float sMouseY;
|
|
||||||
public static final int DECIMAL = 65;
|
|
||||||
ClickHandler ch; // Mouse event handler
|
|
||||||
|
|
||||||
Calculator calc; ///blblblblb //<>//
|
|
||||||
|
|
||||||
void setup(){
|
|
||||||
size(400,400);
|
|
||||||
offset = new PVector(width/2, height/2);
|
|
||||||
ch = new ClickHandler();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void draw(){
|
|
||||||
background(196);
|
|
||||||
sMouseX = (mouseX - offset.x)/scale;
|
|
||||||
sMouseY = (mouseY - offset.y)/scale;
|
|
||||||
translate(offset.x,offset.y);
|
|
||||||
scale(scale);
|
|
||||||
point(0,0);
|
|
||||||
m.display();
|
|
||||||
clock.display();
|
|
||||||
//p.display();
|
|
||||||
t.display();
|
|
||||||
//println( + " " + ;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mouseClicked(){
|
|
||||||
//clock.setTime(new Time48(16,0,0));
|
|
||||||
|
|
||||||
// Every clickable element needs check whether the mouse is over it every frame, and if both clicked and mouseover then do action.
|
|
||||||
ch.cascade(sMouseX, sMouseY);
|
|
||||||
}
|
|
||||||
|
|
||||||
void call(String _call){
|
|
||||||
method(_call);
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
B12NumbersV3
|
B12NumbersV3
|
||||||
Beta version of a clock in base 12.
|
Beta version of a clock and calculator in base 12.
|
||||||
by Nayan Sawyer
|
by Nayan Sawyer
|
||||||
started Mar 2022
|
started Mar 2022
|
||||||
version 1.0.0.1 May 20 2022
|
version 1.0.0.2 Oct 28 2022
|
||||||
|
|
||||||
Characters are a variation of Kaktovik Inupiaq numerals
|
Characters are a variation of Kaktovik Inupiaq numerals,
|
||||||
reversed and in base 12 instead of 20. I take no credit
|
the orientation of which has been flipped and in base 12
|
||||||
for the design.
|
instead of 20. I take no credit for the design.
|
||||||
Includes method relay code by Quark - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html
|
Includes method relay code by Quark - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html
|
||||||
for more details. Also includes the library exp4j for evaluating mathematical expressions.
|
for more details. Also includes the library exp4j for evaluating mathematical expressions.
|
||||||
|
|
||||||
@@ -31,6 +31,9 @@
|
|||||||
- B12Digit.setValue() does not check input and only accepts ints
|
- B12Digit.setValue() does not check input and only accepts ints
|
||||||
- B12Digit.getValue() returns int not byte
|
- B12Digit.getValue() returns int not byte
|
||||||
|
|
||||||
|
changelog 1.0.0.2
|
||||||
|
- Added license and updated main B12NumbersV3 text header
|
||||||
|
|
||||||
changelog 1.0.0.1
|
changelog 1.0.0.1
|
||||||
- Some bug fixes, made more things private, and fixed
|
- Some bug fixes, made more things private, and fixed
|
||||||
timer
|
timer
|
||||||
|
|||||||
Reference in New Issue
Block a user