Skip to content
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.

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

Mr. III first changes #16

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -16,6 +16,4 @@ pygame = "*"
numpy = "*"


[requires]

python_version = "3.5"
167 changes: 97 additions & 70 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion three.py/Mandlebrot.py
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ def initialize(self):
float power = 0.3;

int i;
int maxiter = 512;
int maxiter = 100;
for(i=0; i<maxiter; i++)
{
float x = (z.x * z.x - z.y * z.y) + c.x;
2 changes: 1 addition & 1 deletion three.py/physics/ComponentMesh.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ def overlaps(self,other):
if "Sphere" not in self.componentDict.keys():
return False

overlaps = (self.componentDict["Sphere"].intersectsSphere(other.componentDict["Sphere"]))
overlaps = (self.componentDict["Sphere"].intersectSphere(other.componentDict["Sphere"]))
return overlaps

#TODO: prevent overlap with more types of components