big PR

.github/workflows/docs.yml

@@ -0,0 +1,37 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+permissions:
+    contents: write
+
+jobs:
+  Build-And-Deploy:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+        components: rust-docs
+
+    - name: Generate Documentation
+      run: |
+        cargo doc --no-deps --all-features
+        echo "<meta http-equiv=\"refresh\" content=\"0; url=rusty_ache/index.html\">" > target/doc/index.html
+
+    - name: Deploy to GitHub Pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./target/doc
+        publish_branch: docs
+        force_orphan: true

CONTRIBUTING.md

@@ -0,0 +1,88 @@
+# Contributing to rusty_ache
+
+All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions.
+
+## Table of Contents
+
+- [I Have a Question](#i-have-a-question)
+- [I Want To Contribute](#i-want-to-contribute)
+- [Reporting Bugs](#reporting-bugs)
+- [Suggesting Enhancements](#suggesting-enhancements)
+
+
+## I Have a Question
+
+> If you want to ask a question, we assume that you have read the available [documentation](https://p1onerka.github.io/rusty_ache/rusty_ache/index.html).
+
+Before you ask a question, it is best to search for existing [Issues](https://github.com/p1onerka/rusty_ache/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue.
+
+If you then still feel the need to ask a question and need clarification, we recommend the following:
+
+- Open an [Issue](https://github.com/p1onerka/rusty_ache/issues/new).
+- Provide as much context as you can about what you're running into.
+- Provide project and platform versions, depending on what seems relevant.
+
+We will then take care of the issue as soon as possible.
+
+## I Want To Contribute
+
+> ### Legal Notice
+> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project licence.
+
+### Reporting Bugs
+
+#### Before Submitting a Bug Report
+
+A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
+
+- Make sure that you are using the latest version.
+- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://p1onerka.github.io/rusty_ache/rusty_ache/index.html). If you are looking for support, you might want to check [this section](#i-have-a-question)).
+- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the bug tracker.
+- Collect information about the bug:
+    - Stack trace (Traceback)
+    - OS, Platform and Version (Windows, Linux, macOS, x86, ARM).
+    - Version of the compiler, SDK, runtime environment, depending on what seems relevant.
+    - Possibly your input and the output.
+    - Can you reliably reproduce the issue? And can you also reproduce it with older versions?
+
+#### How Do I Submit a Good Bug Report?
+
+> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to xeniia.ka@gmail.com.
+
+We use GitHub issues to track bugs and errors. If you run into an issue with the project:
+
+- Open an [Issue](https://github.com/p1onerka/rusty_ache/issues/new).
+- Explain the behavior you would expect and the actual behavior.
+- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. For good bug reports you should isolate the problem and create a reduced test case.
+- Provide the information you collected in the previous section.
+
+Once it's filed:
+
+- The project team will label the issue accordingly.
+- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps.
+- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be implemented by someone.
+
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for *rusty_ache* including completely new features and minor improvements to existing functionality. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
+
+#### Before Submitting an Enhancement
+
+- Make sure that you are using the latest version.
+- Read the [documentation](https://p1onerka.github.io/rusty_ache/rusty_ache/index.html) carefully and find out if the functionality is already covered, maybe by an individual configuration.
+- Perform a [search](https://github.com/p1onerka/rusty_ache/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
+
+#### How Do I Submit a Good Enhancement Suggestion?
+
+Enhancement suggestions are tracked as [GitHub issues](https://github.com/p1onerka/rusty_ache/issues).
+
+- Use a clear and descriptive title for the issue to identify the suggestion.
+- Provide a step-by-step description of the suggested enhancement in as many details as possible.
+- Describe the current behavior and explain which behavior you expected to see instead and why. At this point you can also tell which alternatives do not work for you.
+- You may want to include screenshots or screen recordings which help you demonstrate the steps or point out the part which the suggestion is related to.
+- Explain why this enhancement would be useful to most *rusty_ache* users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
+
+## Attribution
+This guide is based on the [contributing.md](https://contributing.md/generator)!

Cargo.toml

@@ -2,6 +2,8 @@
 name = "rusty_ache"
 version = "0.1.0"
 edition = "2024"
+documentation = "https://p1onerka.github.io/rusty_ache"
+repository = "https://github.com/p1onerka/rusty_ache"
 
 [[bin]]
 name = "main"
@@ -12,3 +14,6 @@ path = "src/bin/main.rs"
 image = "0.25.8"
 pixels = "0.15.0"
 winit = "0.30.12"
+
+[package.metadata.docs.rs]
+all-features = true

README.md

@@ -1,2 +1,41 @@
-# rusty_ache
+# Rusty Ache
 Blazingly fast game engine written in Rust.
+
+## How to run
+Clone this repo:
+```bash
+  git clone git@github.com:p1onerka/rusty_ache.git
+```
+Open the project:
+```bash
+  cd rusty_ache
+```
+Run the project:
+```bash
+  cargo run --bin main
+```
+
+## Demo
+
+![Demo](resources/demo_gif.gif)
+
+## Docs
+Project documentation is availible [here](https://p1onerka.github.io/rusty_ache/rusty_ache/index.html).
+
+## Performance
+
+Below is a graph showing the dependence of FPS on the number of simultaneously rendered objects, created under the following conditions:
+
+- Setup: MacBook M1, 8Gb RAM
+- Data: 113x113px object 
+- Resolution: 200x200px
+
+![Performance diagram](resources/perf_diag.png)
+
+As shown on the graph, the engine’s performance is above 20 FPS with <=40 objects. It is strongly discouraged to add more than this number of objects with a size similar to 113x113px on a range smaller than resolution parameters.
+
+## Devs
+- [Aleksei Dmitrievstev](https://github.com/admitrievtsev)
+- [Ksenia Kotelnikova](https://github.com/p1onerka)
+- [Sofya Kozyreva](https://github.com/sofyak0zyreva)
+- [Kostya Oreshin](https://github.com/sevenbunu)

src/bin/main.rs

@@ -1,114 +1,34 @@
-use image::ImageReader;
-
-use rusty_ache::Resolution;
-use rusty_ache::engine::config::{Config, EngineConfig};
-use rusty_ache::engine::scene::Scene;
+use rusty_ache::engine::Engine;
+use rusty_ache::engine::scene::game_object::GameObject;
 use rusty_ache::engine::scene::game_object::components::script::Script;
-use rusty_ache::engine::scene::game_object::components::sprite::Sprite;
 use rusty_ache::engine::scene::game_object::position::Position;
-use rusty_ache::engine::scene::game_object::{GameObject, Object};
-use rusty_ache::engine::{Engine, GameEngine};
+use rusty_ache::interface::{create_obj_with_img, init_engine, init_scene};
 use rusty_ache::screen::{HEIGHT, WIDTH};
 
 fn main() {
-    let mut engine = GameEngine::new(
-        Box::new(EngineConfig::new(Resolution::new(WIDTH, HEIGHT))),
-        Scene::new(
-            vec![
-                GameObject::new(
-                    vec![Box::new(Sprite::new(
-                        Some(
-                            ImageReader::open("src/bin/resources/command_center.png")
-                                .unwrap()
-                                .decode()
-                                .unwrap(),
-                        ),
-                        None,
-                        (0, 0),
-                    ))],
-                    None,
-                    Position {
-                        x: 0,
-                        y: 0,
-                        z: 1,
-                        is_relative: false,
-                    },
-                ),
-                GameObject::new(
-                    vec![Box::new(Sprite::new(
-                        Some(
-                            ImageReader::open("src/bin/resources/command_center.png")
-                                .unwrap()
-                                .decode()
-                                .unwrap(),
-                        ),
-                        Some((
-                            ImageReader::open("src/bin/resources/cc_shadow.png")
-                                .unwrap()
-                                .decode()
-                                .unwrap(),
-                            (-7, 4),
-                        )),
-                        (0, 0),
-                    ))],
-                    None,
-                    Position {
-                        x: 130,
-                        y: -100,
-                        z: 2,
-                        is_relative: false,
-                    },
-                ),
-                GameObject::new(
-                    vec![Box::new(Sprite::new(
-                        Some(
-                            ImageReader::open("src/bin/resources/command_center.png")
-                                .unwrap()
-                                .decode()
-                                .unwrap(),
-                        ),
-                        Some((
-                            ImageReader::open("src/bin/resources/cc_shadow.png")
-                                .unwrap()
-                                .decode()
-                                .unwrap(),
-                            (-7, 4),
-                        )),
-                        (0, 0),
-                    ))],
-                    None,
-                    Position {
-                        x: 15,
-                        y: -25,
-                        z: 3,
-                        is_relative: false,
-                    },
-                ),
-            ],
-            vec![Box::new(Sprite::new(
-                Some(
-                    ImageReader::open("src/bin/resources/battlecruiser_main.png")
-                        .unwrap()
-                        .decode()
-                        .unwrap(),
-                ),
-                Some((
-                    ImageReader::open("src/bin/resources/bc_shadow.png")
-                        .unwrap()
-                        .decode()
-                        .unwrap(),
-                    (0, -10),
-                )),
-                (60, -60),
-            ))],
-            Position {
-                x: -10,
-                y: 10,
-                z: 0,
-                is_relative: false,
-            },
-        ),
+    let tower_obj = create_obj_with_img("src/bin/resources/tower.png", 82, 37, true);
+    let junk_house_obj = create_obj_with_img("src/bin/resources/junk_house.png", 150, -150, true);
+    let pool_house_obj = create_obj_with_img("src/bin/resources/pool_house.png", 15, -25, true);
+    let tall_house_obj = create_obj_with_img("src/bin/resources/tall_house.png", 210, -80, true);
+    let skyscraper_obj = create_obj_with_img("src/bin/resources/skyscraper.png", 150, 55, true);
+    let cabin_obj = create_obj_with_img("src/bin/resources/cabin.png", 280, -60, true);
+    let main_ship_obj = create_obj_with_img("src/bin/resources/white_ship.png", 0, 0, true);
+
+    let hermit_house_obj = create_obj_with_img("src/bin/resources/junk_house.png", 400, 240, true);
+
+    let scene = init_scene(
+        &[
+            cabin_obj,
+            skyscraper_obj,
+            hermit_house_obj,
+            tower_obj,
+            tall_house_obj,
+            junk_house_obj,
+            pool_house_obj,
+        ],
+        main_ship_obj,
     );
+    let mut engine = init_engine(scene, WIDTH, HEIGHT);
     engine.render().unwrap();
     engine.run().unwrap()
 }

src/bin/resources/sources.md

@@ -0,0 +1,6 @@
+## Asset sources
+All of the assets from demo are availible for free usage, you can check them out here:
+
+- [ship](https://starlight-furnace.itch.io/starlight-menagerie)
+- [buildings](https://morithedaichi.itch.io/future-assets-free)
+- [tiles](https://starlight-furnace.itch.io/isometric-map-pack-archology-south)

src/engine/mod.rs

@@ -11,12 +11,13 @@ use crate::engine::scene_manager::SceneManager;
 use crate::render::renderer::DEFAULT_BACKGROUND_COLOR;
 use crate::render::renderer::Renderer;
 use crate::screen::{App, HEIGHT, WIDTH};
+//use image::ImageReader;
 use std::io::Error;
+use std::sync::atomic::Ordering;
 use std::sync::{Arc, RwLock};
 use std::thread;
 use std::time::Duration;
 use winit::event_loop::{ControlFlow, EventLoop};
-use winit::keyboard::KeyCode;
 use winit::window::Window;
 
 /// A trait for describing entity for main engine logic
@@ -57,6 +58,10 @@ impl Engine for GameEngine {
             //config,
             render: Arc::new(RwLock::from(Renderer::new(
                 res,
+                /*Some(ImageReader::open("src/bin/resources/tile2.png")
+                .unwrap()
+                .decode()
+                .unwrap())*/
                 None,
                 SceneManager::new(scene),
             ))),
@@ -80,7 +85,8 @@ impl Engine for GameEngine {
         let shared_window_clone = shared_window.clone();
 
         let mut app = App::new(shared_pixel_data, shared_window);
-        let key_pressed_clone = app.key_pressed.clone();
+        //let key_pressed_clone = app.key_pressed.clone();
+        let keys_pressed_clone = app.keys_pressed.clone();
         let renderer = self.render.clone();
         // Producer thread
         thread::spawn(move || {
@@ -95,13 +101,19 @@ impl Engine for GameEngine {
 
             let screen_size = (WIDTH * HEIGHT) as usize;
             loop {
-                let vector_move = match *key_pressed_clone.read().unwrap() {
+                /*let vector_move = match *key_pressed_clone.read().unwrap() {
                     Some(KeyCode::KeyW) => (0, 1),
                     Some(KeyCode::KeyA) => (-1, 0),
                     Some(KeyCode::KeyS) => (0, -1),
                     Some(KeyCode::KeyD) => (1, 0),
                     _ => (0, 0),
-                };
+                };*/
+                let dx = (keys_pressed_clone.d.load(Ordering::Relaxed) as i32)
+                    - (keys_pressed_clone.a.load(Ordering::Relaxed) as i32);
+                let dy = (keys_pressed_clone.w.load(Ordering::Relaxed) as i32)
+                    - (keys_pressed_clone.s.load(Ordering::Relaxed) as i32);
+
+                let vector_move = (dx, dy);
                 //println!("{:?}", vector_move);
                 renderer
                     .write()