+++ /dev/null
-#!/bin/sh
-
-make clean all
\ No newline at end of file
Things needed to create the initial sequential version:
- Rendering a circle
- Rendering many circles (instanced rendering)
- -
\ No newline at end of file
+ -
+++ /dev/null
-# Determines 4
-# This must be at least 2 (for now).
-thread_count 2
-
-# Determines the number of physics bodies in the simulation.
-body_count 2500
-
-# Determines the number of different types of bodies.
-# This must be specified before the body_color or interaction settings.
-body_type_count 4
-
-# Determines what the color is of each of the body types.
-# Uses standard RGB with values ranging from 0 to 1.
-# Type# R G B
-body_color 0 1.0 0.0 0.0
-body_color 1 0.0 1.0 0.0
-body_color 2 0.0 0.0 1.0
-body_color 3 1.0 1.0 1.0
-
-# Determines the range of values a bodies mass can be, sampled from
-# a uniform distribution.
-# Type# Min Max
-body_mass_range 0 2.0 4.0
-body_mass_range 1 15.0 20.0
-body_mass_range 2 5.0 7.0
-body_mass_range 3 3.0 6.0
-
-# Determines the friction coeffient, u.
-# Equation of friction used:
-# F = -u * v;
-# where v is the velocity of the body.
-# Set to 0.0 to watch very wild behavior.
-friction 6.0
-
-# Determines the scale of the interaction calcuations.
-# Mostly an implementation detail, but effectively, the "distance" column on
-# the interactions plus one, is multipled by this number and that is the maximum distance
-# two bodies will interact in terms of pixels.
-universe_scale 20.0
-
-# Determines the magnitude of the force applied to bodies that are within
-# 'universe_scale' pixels of each other.
-near_repulsive_force 200.0
-
-# Determines how two bodies will interact. Note, that this is not a symmetric relation.
-# Body Type# Other Type# Distance Force
-interaction 0 1 5.0 200.0
--- /dev/null
+# Determines 4
+# This must be at least 2 (for now).
+thread_count 2
+
+# Determines the number of physics bodies in the simulation.
+body_count 2500
+
+# Determines the number of different types of bodies.
+# This must be specified before the body_color or interaction settings.
+body_type_count 4
+
+# Determines what the color is of each of the body types.
+# Uses standard RGB with values ranging from 0 to 1.
+# Type# R G B
+body_color 0 1.0 0.0 0.0
+body_color 1 0.0 1.0 0.0
+body_color 2 0.0 0.0 1.0
+body_color 3 1.0 1.0 1.0
+
+# Determines the range of values a bodies mass can be, sampled from
+# a uniform distribution.
+# Type# Min Max
+body_mass_range 0 2.0 4.0
+body_mass_range 1 15.0 20.0
+body_mass_range 2 5.0 7.0
+body_mass_range 3 3.0 6.0
+
+# Determines the friction coeffient, u.
+# Equation of friction used:
+# F = -u * v;
+# where v is the velocity of the body.
+# Set to 0.0 to watch very wild behavior.
+friction 6.0
+
+# Determines the scale of the interaction calcuations.
+# Mostly an implementation detail, but effectively, the "distance" column on
+# the interactions plus one, is multipled by this number and that is the maximum distance
+# two bodies will interact in terms of pixels.
+universe_scale 20.0
+
+# Determines the magnitude of the force applied to bodies that are within
+# 'universe_scale' pixels of each other.
+near_repulsive_force 200.0
+
+# Determines how two bodies will interact. Note, that this is not a symmetric relation.
+# Body Type# Other Type# Distance Force
+interaction 0 1 5.0 200.0
+++ /dev/null
-version(1);
-
-project_name = "CSC718_Project";
-
-patterns = {
-"*.c",
-"*.cpp",
-"*.h",
-"*.sh",
-"*.glsl",
-"*.4coder",
-"Makefile",
-};
-
-blacklist_patterns = {
-"*.git",
-};
-
-load_paths_custom = {
- {"."},
-};
-
-load_paths = {
- { load_paths_custom, .os = "linux" },
-};
-
-command_list = {
- { .name = "build",
- .out = "*compilation*",
- .footer_panel = true,
- .save_dirty_files = true,
- .cursor_at_end = false,
- .cmd = { { "./build.sh", .os = "linux" } },
- },
- { .name = "run",
- .out = "*run*",
- .footer_panel = true,
- .save_dirty_files = false,
- .cursor_at_end = true,
- .cmd = { { "./sim", .os = "linux" } },
- }
-};
-
-fkey_command[5] = "build";
-fkey_command[6] = "run";
\ No newline at end of file
--- /dev/null
+# Adjust the thread count here.
+# Note, that for the pthread version of the program (./sim), this must be
+# at least 2, since the pthread version splits different work between at
+# least 2 different threads.
+# The sequential version (./sim_seq) is not affected by this setting.
+thread_count 4
+
+body_count 4000
+body_type_count 4
+body_color 0 1.000000 0.000000 0.000000
+body_color 1 0.000000 1.000000 0.000000
+body_color 2 0.000000 0.000000 1.000000
+body_color 3 1.000000 1.000000 1.000000
+body_mass_range 0 4.000000 6.000000
+body_mass_range 1 4.000000 6.000000
+body_mass_range 2 4.000000 6.000000
+body_mass_range 3 4.000000 6.000000
+friction 6.000000
+near_repulsive_force 100.000000
+universe_scale 20.000000
+interaction 0 0 6.571008 93.585510
+interaction 0 1 5.113249 8.085373
+interaction 0 2 6.926418 94.550446
+interaction 0 3 6.511862 -55.279800
+interaction 1 0 4.021953 119.258820
+interaction 1 1 6.973307 198.194061
+interaction 1 2 5.498415 12.963989
+interaction 1 3 4.898501 118.944519
+interaction 2 0 6.477647 -21.892441
+interaction 2 1 5.874678 115.875519
+interaction 2 2 5.877005 -176.505890
+interaction 2 3 5.706183 -4.952164
+interaction 3 0 4.521145 -71.464767
+interaction 3 1 5.963416 -90.654907
+interaction 3 2 5.246637 62.910187
+interaction 3 3 4.313733 -90.980698
projects / csc718.git / commitdiff