diff options
| author | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
|---|---|---|
| committer | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
| commit | ac3f1e423e696392ea0a50c2652b829e5c5734b6 (patch) | |
| tree | b6ecb80019dae822619079ce34336d34a033f2df /src/skybox.h | |
| parent | f846ddba00aee29675f0bd4f5dbc87a94a422368 (diff) | |
| parent | 14684344d553dee4b3cc252709716bff927e85b8 (diff) | |
resolve merge conflicts and attempt to fix local paths
Diffstat (limited to 'src/skybox.h')
| -rw-r--r-- | src/skybox.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/skybox.h b/src/skybox.h index 94d1354..d9995ba 100644 --- a/src/skybox.h +++ b/src/skybox.h @@ -202,12 +202,12 @@ public: - {"/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_rt.png", - "/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_lf.png", - "/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_up.png", - "/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_dn.png", - "/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_bk.png", - "/Users/jesswan/Desktop/cs2240/ocean-simulation/resources/images/cupertin-lake_ft.png", + {":resources/images/cupertin-lake_rt.png", + ":resources/images/cupertin-lake_lf.png", + ":resources/images/cupertin-lake_up.png", + ":resources/images/cupertin-lake_dn.png", + ":resources/images/cupertin-lake_bk.png", + ":resources/images/cupertin-lake_ft.png", }; float ROTATE_SPEED = .01f; // 1 degree per sec |