Cloud branch

.gitignore

@@ -14,3 +14,13 @@ log.txt
 *.dll
 *.pyc
 
+//! DS_2_4 #Ignore files unneeded.
+//! (i.e. cmake and /dep/... files)
+//!*.cmake
+
+/deps/*
+deps/*
+/html/*
+html/*
+CMakeDoxyfile.in
+CMakeDoxygenDefaults.cmake

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project(craft)
 
-FILE(GLOB SOURCE_FILES src/*.c)
+FILE(GLOB SOURCE_FILES src/*.c*)
 
 add_executable(
     craft

SprintTracker.md

@@ -0,0 +1,52 @@
+# Sprints
+
+## Sprint 1 (2/19/21 - 3/5/21)
+### Velocity: 9
+
+Completed Tasks  
+DS 2.1 - 5  
+DS 2.2 - 2  
+DS 1.1 - 1  
+DS 3.2 - 1  
+
+Continuing Tasks  
+US 1.1.1 - 3  
+US 5.1.1 - 3  
+US 5.1.2 - 2  
+US 5.1.3 - 2  
+
+DS 2.3 - 2  
+DS 2.4 - 3  
+DS 4.1 - 5  
+
+## Sprint 2 (3/5/21 - 3/19/21)
+### Velocity: 17
+
+Completed Tasks  
+US 1.1.1 - 3 - Alex  
+US 5.1.1 - 3 - Michael  
+US 5.1.2 - 2 - Michael  
+US 5.1.3 - 2 - Michael  
+
+DS 2.3 - 2 - Alex  
+DS 2.4 - 3 - Alex  
+DS 6.1 - 1 - Michael  
+DS 6.2 - 1 - Michael  
+
+Continuing Tasks  
+DS 4.1 - 5 - Alex  
+DS 4.2 - 5 - Michael  
+
+## Sprint 3 (3/19/21 - 4/2/21)
+### Velocity: 18
+Completed Tasks
+US 1.1.5 - 3 - Alex  
+US 3.1.1 - 1 - Michael  
+US 3.2.1 - 1 - Michael  
+US 5.2.1 - 3 - Michael  
+
+DS 4.1 - 5 - Alex  
+DS 4.2 - 5 - Michael  
+
+Continuing Tasks  
+US 1.1.2 - - 3 - Alex  

UserStories.md

@@ -0,0 +1,97 @@
+# User Stories and Tasks
+
+## US - User Stories
+### 1. As a player, I want the clouds to move so that the environment is more immersive.
+1. Dynamic Clouds
+    1. ~~Add Cloud Block - 3~~
+    2. Add Cloud Movement - ~~3~~
+        1. ~~Add function to move cloud at same altitude - 2~~
+        2. ~~Add function to test cloud motion functtion~~ - 2~~
+        3. Implement functions into map.cpp - 8
+    4. ~~Dynamic Cloud Shape Generation - 5~~ (Already implemented)
+    5. Bound Cloud Movement and Generation - 8
+    6. Continuous Cloud Generation during Runtime - 5
+    7. Convert files the Cloud source code is dep. on to C++ compilation - ~~3~~
+        1.  ~~Create cloud.h - 2~~
+        2.  ~~Create cloud.cpp - 2~~
+        3.  ~~Allow program to be called by C code - 2~~
+        4.  ~~Implement into map.cpp and main.cpp - 3~~
+### 2. As a player, I want a weather system so that there's more variety day-to-day.
+1. Rain
+    1. Create Dark Cloud Texture - 2
+    2. Create Rain Texture - 2
+    3. Add Rain Effect to the Game - 5
+    4. Add a button or command to change weather - 5
+    5. Research Weather Cycle or Random Generation - 5
+2. Fog
+    1. ~~Add Fog Effect - 3~~
+    2. Fog dependent on time of day - 3
+        1. ~~Alter map functions to accept time as an argument - 2~~
+        2. ~~Write function to change cloud/fog depending on time - 2~~
+        3. Access time passed in game world - 5
+        4. Implement time dependent functions - 5
+    4. Make Fog Transparent - 3
+    5. Clouds Lower to Fog, Fog Rises to Clouds - 3
+        1. ~~Write function to get cloud blocks - 2
+        2. ~~Write function to lower cloud blocks - 2~~
+        3. ~~Write function to raise cloud blocks - 2~~
+        4. ~~Write function to test cloud position change - 2~~
+        5. Implement functions into main.cpp and map.cpp - 8
+### 3. As a player, I want more biomes so that exploration is more rewarding.
+1. Snow Blocks
+    1. ~~Add Snow Block to Textures - 1~~
+    2. ~~Add Snow Block Texture to Bitmap - 2~~ (Trivial after more research)
+    3. ~~Add Snow Block - 3~~ (Trivial after more research)
+2. Ice Block
+    1. ~~Add Ice Block to Textures - 1~~
+    2. Graphics: Make it transparent - 2
+    3. Effect: Slow down player movement - 2
+    4. Advanced Effect: Momentum - 5
+### 4. As a player, I want the world to endlessly generate so that I can explore forever.
+1. Find where world generation happens in source files - 8
+2. Figure out how world is generated in craft - 8
+### 5. As a player, I want TNT so that I can blow things up.
+1. Add TNT Block
+    1. ~~Add the TNT Block - 3~~
+    2. ~~Effect: Destroy Blocks in Radius - 2~~
+    3. ~~Trigger: Right-Click TNT Block - 2~~
+2. Refined TNT Effects
+    1. ~~Chain Trigger: TNT explodes other TNT - 3~~
+    2. Graphics: Add an Explosion effect - 5
+    3. Sound: Add an explosion sound - 5
+    4. Add radial vector explosion for dynamic craters - 8
+
+## DS - Dev Stories
+### 1. As a dev, I want our tasks up on a kanban board so that they are easier to assign and visualize. <br>
+1. ~~Add tasks to the kanban board - 1~~
+### 2. As a dev, I want us to use Doxygen or some other documentation generating software so that we can have fancy .htmls that track our design.
+1. ~~Research Doxygen and Alternatives - 5~~
+2. ~~Get Doxygen up and running - 2~~
+3. ~~Decide on Doxygen standards between the two of us - 2~~
+4. ~~Figure out what can be added to .gitignore. - 3~~
+### 3. As a dev, I want pertinent documents up on github so that the team always has the most current version to look to for reference.
+1. Look into using wiki to store our documents - 2
+2. ~~Generate a UserStories markdown file for github - 1~~
+### 4. As a dev, I want to learn more about OpenGL so that I feel confident adding new textures and effects to Craft.
+1. ~~Alex Completes Watching [Cherno](https://www.youtube.com/playlist?list=PLlrATfBNZ98foTJPJ_Ev03o2oq3-GGOS2) - 5~~
+2. ~~Michael Completes Watching [Cherno](https://www.youtube.com/playlist?list=PLlrATfBNZ98foTJPJ_Ev03o2oq3-GGOS2) - 5~~
+### 5. As a dev, I want a solid branching strategy for our repository so that our version control is stable and effective.
+1. ~~Generate branches for repository - 1~~
+### 6. As a dev, I want a document that tracks our velocity so that we can measure our progress.
+1. ~~Generate SprintTracker.md - 1~~
+2. ~~Add it to github - 1~~
+### 7. As a dev., I want the project code to be more easily read and highly refactored.
+1. Refactor World.c functions
+    1. ~~Refactor create_world() - 1~~
+2. Refactor map.cpp functions
+    1. Refactor map_get() - 1
+    2. ~~Refactor map_set() - 1~~
+3. Refactor main.cpp functions
+    1. Refactor _hit_test() - 1
+    2. Refactor compute_chunks() - 1
+    3. ~~Refactor delete_chunks() - 1~~
+    4. Refactor check_workers() - 1
+    5. ~~Refactor set_lights() - 1~~
+    6. Refactor cylinder() - 1
+    7. Refactor sphere() - 1
+    8. Refactor cube() - 1

src/auth.c

@@ -10,7 +10,7 @@
 size_t write_function(char *data, size_t size, size_t count, void *arg) {
     size_t length = size * count;
     char *dst = (char *)arg;
-    char *src = malloc(length + 1);
+    char *src = (char*)malloc(length + 1);
     memcpy(src, data, length);
     src[length] = '\0';
     strncat(dst, src, MAX_RESPONSE_LENGTH - strlen(dst) - 1);

src/client.c

@@ -164,7 +164,7 @@ char *client_recv() {
     }
     if (p >= queue) {
         int length = p - queue + 1;
-        result = malloc(sizeof(char) * (length + 1));
+        result = (char*)malloc(sizeof(char) * (length + 1));
         memcpy(result, queue, sizeof(char) * length);
         result[length] = '\0';
         int remaining = qsize - length;
@@ -177,7 +177,7 @@ char *client_recv() {
 }
 
 int recv_worker(void *arg) {
-    char *data = malloc(sizeof(char) * RECV_SIZE);
+    char *data = (char*)malloc(sizeof(char) * RECV_SIZE);
     while (1) {
         int length;
         if ((length = recv(sd, data, RECV_SIZE - 1, 0)) <= 0) {

src/clouds.cpp

@@ -0,0 +1,164 @@
+
+
+#include "clouds.h"
+
+struct cloudData{
+    private:
+        std::vector<cloudPosition> privateCloud;
+    public:
+        void set(std::vector<cloudPosition> cloud){
+            privateCloud = cloud;
+        }
+        std::vector<cloudPosition> get(){
+            return privateCloud;
+        }
+} allCloudData;
+
+
+//Worker Functions
+extern "C"
+std::vector<cloudPosition> setClouds(std::vector<cloudPosition> allClouds, int x, int y, int z)
+{
+    cloudPosition p;
+    p.x =x;
+    p.y = y;
+    p.z = z;
+    allClouds.push_back(p);
+
+    //cloudData data;
+    //allCloudData.set(allClouds);
+    return allClouds;
+}
+
+extern "C"
+std::vector<cloudPosition> getClouds(){
+    cloudData data;
+    std::vector<cloudPosition> clouds = allCloudData.get();
+    printf("Get!\n");
+    return clouds;
+}
+
+extern "C"
+std::vector<cloudPosition> moveAllCloudsDown(Map *map, std::vector<cloudPosition> allCloudPositions, int t)
+{
+    int xyz = 2;
+    int  posChange = -1;
+    allCloudPositions = moveClouds(map,allCloudPositions, posChange, xyz, t);
+    return allCloudPositions;
+}
+
+extern "C"
+std::vector<cloudPosition> moveAllCloudsUp(Map *map, std::vector<cloudPosition> allCloudPositions, int t)
+{
+    int xyz = 2;
+    int  posChange = 1;
+    allCloudPositions = moveClouds(map,allCloudPositions, posChange, xyz, t);
+    return allCloudPositions;
+}
+
+extern "C"
+std::vector<cloudPosition> moveAllCloudsOver(Map *map, std::vector<cloudPosition> allCloudPositions, int t)
+{   
+    int xyz = 1;
+    int  posChange = 1;
+    std::vector<cloudPosition> movedClouds = moveClouds(map,allCloudPositions, posChange, xyz, t);
+    return movedClouds;
+}
+
+extern "C"
+std::vector<cloudPosition> moveClouds(Map *map, std::vector<cloudPosition> clouds, int posChange, int xyz, int t)
+{
+    std::vector<cloudPosition> cloudCopy = clouds;
+    std::vector<cloudPosition> returnClouds = clouds;
+    while (clouds.size() > 0)
+    {
+        cloudPosition p = clouds.back();
+        //map_set(map, p.x, p.y, p.z, 0, t);     //remove cloud at current position
+        clouds.pop_back();
+    }
+    while (clouds.size() > 0)
+    {
+        cloudPosition p = cloudCopy.back();
+
+        if(xyz == 1){ 
+            //map_set(map, p.x + posChange, p.y, p.z, 16, t);
+        }
+        else if(xyz == 2){ 
+            //map_set(map, p.x, p.y + posChange, p.z, 16, t);
+        }
+        else if(xyz == 3){ 
+            //map_set(map, p.x, p.y, p.z + posChange, 16, t);     
+        }
+        clouds.pop_back();
+    }
+    if(xyz == 1){ 
+        for(int i = 0; i < returnClouds.size(); i++){returnClouds[i].x = returnClouds[i].x + posChange;}    
+    }
+    else if(xyz == 2){ 
+        for(int i = 0; i < returnClouds.size(); i++){returnClouds[i].y = returnClouds[i].y + posChange;}
+    }
+    else if(xyz == 3){ 
+        for(int i = 0; i < returnClouds.size(); i++){returnClouds[i].z = returnClouds[i].z + posChange;}
+    }
+
+    return returnClouds;
+}
+
+
+//Test Functions
+extern "C"
+int gotClouds(std::vector<cloudPosition> clouds){ 
+    if(clouds.size() == 0)
+    {
+        printf("Test FAILED: Clouds in Vector "); printf("%ld", clouds.size()); printf("\n");
+        return -1;
+    }
+    else{
+        printf("Test PASSED: Clouds in Vector "); printf("%ld", clouds.size()); printf("\n");
+        return clouds.size();
+    } 
+}
+
+extern "C"
+int isPositionChanged(std::vector<cloudPosition>startData, std::vector<cloudPosition> endData){
+    int test = 0;
+    int done = 0;
+    while( test < 1 && done == 0){
+        if (startData.size() == endData.size()){
+            for(int idx=0; idx<startData.size(); idx++){
+                if(startData[idx].x == endData[idx].x){
+                    if(startData[idx].y == endData[idx].y){
+                        if(startData[idx].z == endData[idx].z){
+                           /*Point is the same;*/ }
+                        else{ test++; }}
+                    else{ test++; }}
+                else{ test++; }
+            }
+            done++;
+        }else {test++;}
+    }
+
+    if( test >= 1 )
+    {   
+        /// @note Output supressed for testing function efficacy
+        /// printf("Test FAILED: US 2.2.4 Cloud Position Changed\n");
+        return -1;
+    } 
+    else{
+        /// @note Output supressed for testing function efficacy
+        /// printf("Test PASSED: US 2.2.4 Cloud Position Changed\n");
+        return 0;
+    }
+}
+extern "C"
+int isValidChar(char xyz){
+    if( xyz == 'x' || xyz == 'y' || xyz == 'z')
+    {
+        printf("Test PASSED: valid position char change\n");
+        return 0;
+    }
+    else{
+        printf("Test PASSED: valid position char change\n");
+        return -1;
+    }
+}