Changeset 319 for trunk


Ignore:
Timestamp:
08/21/14 04:02:01 (11 years ago)
Author:
epyon
Message:
  • created core module and moved all free source files there
  • took the opportunity to update all copyright lines and minor cleanup
  • minor fixes
  • not all examples are up to date
Location:
trunk
Files:
2 added
6 deleted
133 edited
30 moved

Legend:

Unmodified
Added
Removed

  • trunk/nv/core/any.hh

    r254 r319  
    1313 */
    1414
    15 #ifndef NV_ANY_HH
    16 #define NV_ANY_HH
     15#ifndef NV_CORE_ANY_HH
     16#define NV_CORE_ANY_HH
    1717
    18 #include <nv/common.hh>
    19 #include <nv/type_traits.hh>
     18#include <nv/core/common.hh>
     19#include <nv/core/type_traits.hh>
    2020
    2121namespace nv
    … …  
    152152}
    153153
    154 #endif // NV_ANY_HH
     154#endif // NV_CORE_ANY_HH

  • trunk/nv/core/array.hh

    r260 r319  
    1111 */
    1212
    13 #ifndef NV_ARRAY_HH
    14 #define NV_ARRAY_HH
     13#ifndef NV_CORE_ARRAY_HH
     14#define NV_CORE_ARRAY_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <vector>
    1818#include <array>
    … …  
    191191}
    192192
    193 #endif // NV_ARRAY_HH
     193#endif // NV_CORE_ARRAY_HH

  • trunk/nv/core/array2d.hh

    r255 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313// TODO: make it work with the stl allocator
    1414
    15 #ifndef NV_ARRAY2D_HH
    16 #define NV_ARRAY2D_HH
    17 
    18 #include <nv/common.hh>
    19 #include <nv/math.hh>
    20 #include <nv/range.hh>
     15#ifndef NV_CORE_ARRAY2D_HH
     16#define NV_CORE_ARRAY2D_HH
     17
     18#include <nv/core/common.hh>
     19#include <nv/core/math.hh>
     20#include <nv/core/range.hh>
    2121
    2222namespace nv
    … …  
    360360}
    361361
    362 #endif // NV_ARRAY2D_HH
     362#endif // NV_CORE_ARRAY2D_HH

  • trunk/nv/core/common.hh

    r311 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #ifndef NV_COMMON_HH
    8 #define NV_COMMON_HH
     7#ifndef NV_CORE_COMMON_HH
     8#define NV_CORE_COMMON_HH
    99
    1010// NV Library version
    … …  
    113113#include <cstdint>
    114114#include <cassert>
    115 #include <nv/logging.hh>
     115#include <nv/core/logging.hh>
    116116
    117117#define NV_STRINGIZE_DETAIL(x) #x
    … …  
    227227}
    228228
    229 #endif // NV_COMMON_HH
     229#endif // NV_CORE_COMMON_HH

  • trunk/nv/core/config.hh

    r205 r319  
    1 // Copyright (C) 2012 Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    44
    5 #ifndef NV_CONFIG_HH
    6 #define NV_CONFIG_HH
     5#ifndef NV_CORE_CONFIG_HH
     6#define NV_CORE_CONFIG_HH
    77
    88#define NV_LIB_STATIC  1
    … …  
    1010#define NV_LIB_DYNAMIC 3
    1111
    12 #endif // NV_CONFIG_HH
     12#endif // NV_CORE_CONFIG_HH

  • trunk/nv/core/exception.hh

    r256 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_EXCEPTION_HH
    14 #define NV_EXCEPTION_HH
     13#ifndef NV_CORE_EXCEPTION_HH
     14#define NV_CORE_EXCEPTION_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <string>
    1818#include <exception>
    … …  
    4444}
    4545
    46 #endif // NV_EXCEPTION_HH
     46#endif // NV_CORE_EXCEPTION_HH

  • trunk/nv/core/flags.hh

    r310 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_FLAGS_HH
    14 #define NV_FLAGS_HH
    15 
    16 #include <nv/common.hh>
    17 #include <nv/type_traits.hh>
    18 #include <nv/array.hh>
     13#ifndef NV_CORE_FLAGS_HH
     14#define NV_CORE_FLAGS_HH
     15
     16#include <nv/core/common.hh>
     17#include <nv/core/type_traits.hh>
     18#include <nv/core/array.hh>
    1919
    2020namespace nv
    … …  
    219219} // namespace nv
    220220
    221 #endif // NV_FLAGS_HH
     221#endif // NV_CORE_FLAGS_HH

  • trunk/nv/core/handle.hh

    r295 r319  
    1010 */
    1111
    12 #ifndef NV_HANDLE_HH
    13 #define NV_HANDLE_HH
    14 
    15 #include <nv/common.hh>
    16 #include <nv/array.hh>
     12#ifndef NV_CORE_HANDLE_HH
     13#define NV_CORE_HANDLE_HH
     14
     15#include <nv/core/common.hh>
     16#include <nv/core/array.hh>
    1717
    1818namespace nv
    … …  
    312312}
    313313
    314 #endif // NV_HANDLE_HH
     314#endif // NV_CORE_HANDLE_HH

  • trunk/nv/core/io_event.hh

    r304 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_IO_EVENT_HH
    14 #define NV_IO_EVENT_HH
    15 
    16 #include <nv/common.hh>
    17 #include <nv/types.hh>
     13#ifndef NV_CORE_IO_EVENT_HH
     14#define NV_CORE_IO_EVENT_HH
     15
     16#include <nv/core/common.hh>
    1817
    1918namespace nv
    … …  
    214213         * @param db The database to store all event data in.
    215214         */
    216         void register_io_types( type_database* db );
     215        //void register_io_types( type_database* db );
    217216}
    218217
    219 #endif // NV_IO_EVENT_HH
     218#endif // NV_CORE_IO_EVENT_HH

  • trunk/nv/core/library.hh

    r256 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_LIBRARY_HH
    14 #define NV_LIBRARY_HH
     13#ifndef NV_CORE_LIBRARY_HH
     14#define NV_CORE_LIBRARY_HH
    1515
    16 #include <nv/exception.hh>
    17 #include <nv/string.hh>
     16#include <nv/core/exception.hh>
     17#include <nv/core/string.hh>
    1818
    1919namespace nv
    … …  
    142142} // namespace nv
    143143
    144 #endif // NV_LIBRARY_HH
     144#endif // NV_CORE_LIBRARY_HH

  • trunk/nv/core/logger.hh

    r295 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_LOGGER_HH
    14 #define NV_LOGGER_HH
    15 
    16 #include <nv/string.hh>
    17 #include <nv/logging.hh>
     13#ifndef NV_CORE_LOGGER_HH
     14#define NV_CORE_LOGGER_HH
     15
     16#include <nv/core/string.hh>
     17#include <nv/core/logging.hh>
    1818#include <iosfwd>
    1919#include <list>
    … …  
    210210}
    211211
    212 #endif // NV_LOGGER_HH
     212#endif // NV_CORE_LOGGER_HH

  • trunk/nv/core/logging.hh

    r311 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_LOGGING_HH
    14 #define NV_LOGGING_HH
     13#ifndef NV_CORE_LOGGING_HH
     14#define NV_CORE_LOGGING_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/singleton.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/singleton.hh>
    1818#include <string>
    1919#include <sstream>
    … …  
    7676#endif
    7777
    78 #endif // NV_LOGGING_HH
     78#endif // NV_CORE_LOGGING_HH

  • trunk/nv/core/math.hh

    r312 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #ifndef NV_MATH_HH
    8 #define NV_MATH_HH
    9 
    10 #include <nv/common.hh>
     7#ifndef NV_CORE_MATH_HH
     8#define NV_CORE_MATH_HH
     9
     10#include <nv/core/common.hh>
    1111
    1212#if NV_COMPILER == NV_GNUC
    … …  
    249249} // namespace nv
    250250
    251 #endif // NV_MATH_HH
     251#endif // NV_CORE_MATH_HH

  • trunk/nv/core/position.hh

    r255 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    66
    77/**
    8  * @file gui_element.hh
     8 * @file position.hh
    99 * @author Kornel Kisielewicz
    1010 * @brief UI 2D positioning classes
    1111 */
    1212
    13 #ifndef NV_POSITION_HH
    14 #define NV_POSITION_HH
    15 
    16 #include <nv/common.hh>
    17 #include <nv/math.hh>
    18 #include <nv/range.hh>
     13#ifndef NV_CORE_POSITION_HH
     14#define NV_CORE_POSITION_HH
     15
     16#include <nv/core/common.hh>
     17#include <nv/core/math.hh>
     18#include <nv/core/range.hh>
    1919#include <utility>
    2020
    … …  
    321321}
    322322
    323 #endif // NV_POSITION_HH
     323#endif // NV_CORE_POSITION_HH

  • trunk/nv/core/profiler.hh

    r205 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_PROFILER_HH
    14 #define NV_PROFILER_HH
     13#ifndef NV_CORE_PROFILER_HH
     14#define NV_CORE_PROFILER_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/singleton.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/singleton.hh>
    1818#include <unordered_map>
    1919
    … …  
    8686} // namespace nv
    8787
    88 #endif // NV_PROFILER_HH
     88#endif // NV_CORE_PROFILER_HH

  • trunk/nv/core/random.hh

    r308 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #ifndef NV_RANDOM_HH
    8 #define NV_RANDOM_HH
     7#ifndef NV_CORE_RANDOM_HH
     8#define NV_CORE_RANDOM_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1112#include <random>
    12 #include <nv/math.hh>
    1313
    1414namespace nv
    … …  
    181181}
    182182
    183 #endif // NV_RANDOM_HH
     183#endif // NV_CORE_RANDOM_HH

  • trunk/nv/core/range.hh

    r310 r319  
    1010 */
    1111
    12 #ifndef NV_RANGE_HH
    13 #define NV_RANGE_HH
    14 
    15 #include <nv/common.hh>
    16 #include <nv/math.hh>
    17 #include <nv/type_traits.hh>
     12#ifndef NV_CORE_RANGE_HH
     13#define NV_CORE_RANGE_HH
     14
     15#include <nv/core/common.hh>
     16#include <nv/core/math.hh>
     17#include <nv/core/type_traits.hh>
    1818#include <iterator>
    1919
    … …  
    225225}
    226226
    227 #endif // NV_RANGE_HH
     227#endif // NV_CORE_RANGE_HH

  • trunk/nv/core/singleton.hh

    r205 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_SINGLETON_HH
    14 #define NV_SINGLETON_HH
     13#ifndef NV_CORE_SINGLETON_HH
     14#define NV_CORE_SINGLETON_HH
    1515
    1616#include <cassert>
    … …  
    118118} // namespace nv
    119119
    120 #endif // NV_SINGLETON_HH
     120#endif // NV_CORE_SINGLETON_HH

  • trunk/nv/core/string.hh

    r219 r319  
    1 // Copyright (C) 2012 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    44
    5 #ifndef NV_STRING_HH
    6 #define NV_STRING_HH
     5#ifndef NV_CORE_STRING_HH
     6#define NV_CORE_STRING_HH
    77
    88#include <string>
    … …  
    1111#include <sstream>
    1212#include <fstream>
    13 #include <nv/common.hh>
    14 #include <nv/exception.hh>
     13#include <nv/core/common.hh>
     14#include <nv/core/exception.hh>
    1515
    1616namespace nv
    … …  
    249249}
    250250
    251 #endif // NV_STRING_HH
     251#endif // NV_CORE_STRING_HH

  • trunk/nv/core/time.hh

    r205 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010 */
    1111
    12 #ifndef NV_TIME_HH
    13 #define NV_TIME_HH
     12#ifndef NV_CORE_TIME_HH
     13#define NV_CORE_TIME_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616
    1717namespace nv
    … …  
    146146} // namespace nv
    147147
    148 #endif // NV_TIME_HH
     148#endif // NV_CORE_TIME_HH

  • trunk/nv/core/transform.hh

    r282 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #ifndef NV_TRANSFORM_HH
    8 #define NV_TRANSFORM_HH
     7#ifndef NV_CORE_TRANSFORM_HH
     8#define NV_CORE_TRANSFORM_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212
    1313namespace nv
    … …  
    105105}
    106106
    107 #endif // NV_TRANSFORM_HH
     107#endif // NV_CORE_TRANSFORM_HH

  • trunk/nv/core/type_traits.hh

    r310 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313//    -- once the Variadic Templates cometh, for great justice we will win!
    1414
    15 #ifndef NV_TYPE_TRAITS_HH
    16 #define NV_TYPE_TRAITS_HH
    17 
    18 #include <nv/common.hh>
     15#ifndef NV_CORE_TYPE_TRAITS_HH
     16#define NV_CORE_TYPE_TRAITS_HH
     17
     18#include <nv/core/common.hh>
    1919#include <type_traits>
    2020
    … …  
    230230}
    231231
    232 #endif // NV_TYPE_TRAITS_HH
     232#endif // NV_CORE_TYPE_TRAITS_HH

  • trunk/nv/core/uid.hh

    r266 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111 */
    1212
    13 #ifndef NV_UID_HH
    14 #define NV_UID_HH
     13#ifndef NV_CORE_UID_HH
     14#define NV_CORE_UID_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <unordered_map>
    1818
    … …  
    107107}
    108108
    109 #endif // NV_UID_HH
     109#endif // NV_CORE_UID_HH

  • trunk/nv/curses/curses_terminal.hh

    r222 r319  
    1 // Copyright (C) 2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_CURSES_TERMINAL_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/terminal.hh>
    17 #include <nv/io_event.hh>
     17#include <nv/core/io_event.hh>
    1818
    1919namespace nv

  • trunk/nv/engine/program_manager.hh

    r316 r319  
    1414#define NV_ENGINE_PROGRAM_MANAGER_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <nv/engine/resource_system.hh>
    1818

  • trunk/nv/engine/resource_system.hh

    r316 r319  
    1414#define NV_ENGINE_RESOURCE_MANAGER_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <nv/interface/context.hh>
    1818#include <nv/lua/lua_state.hh>

  • trunk/nv/fmod/fmod_audio.hh

    r194 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_FMOD_AUDIO_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/audio.hh>
    1717

  • trunk/nv/formats/assimp_loader.hh

    r294 r319  
    88#define NV_ASSIMP_LOADER_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/io/string_table.hh>
    1212#include <nv/interface/mesh_loader.hh>

  • trunk/nv/formats/md2_loader.hh

    r287 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_MD2_LOADER_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <unordered_map>
    18 #include <vector>
     18#include <nv/core/array.hh>
    1919#include <nv/interface/mesh_loader.hh>
    2020

  • trunk/nv/formats/md3_loader.hh

    r304 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_MD3_LOADER_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <unordered_map>
    18 #include <vector>
    19 #include <nv/transform.hh>
     18#include <nv/core/array.hh>
     19#include <nv/core/transform.hh>
    2020#include <nv/interface/mesh_data.hh>
    2121#include <nv/interface/mesh_loader.hh>

  • trunk/nv/formats/md5_loader.hh

    r291 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_MD5_LOADER_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/array.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/array.hh>
    1818#include <nv/interface/mesh_loader.hh>
    1919

  • trunk/nv/formats/nmd_loader.hh

    r292 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_NMD_LOADER_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/interface/mesh_loader.hh>
    1212#include <nv/interface/mesh_data.hh>

  • trunk/nv/formats/obj_loader.hh

    r287 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_OBJ_LOADER_HH
    1515
    16 #include <nv/common.hh>
     16#include <nv/core/common.hh>
    1717#include <nv/interface/mesh_loader.hh>
    1818#include <nv/interface/mesh_data.hh>

  • trunk/nv/gfx/animation.hh

    r293 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_ANIMATION_HH
    99
    10 #include <nv/common.hh>
    11 #include <vector>
     10#include <nv/core/common.hh>
     11#include <nv/core/array.hh>
    1212#include <nv/interface/stream.hh>
    13 #include <nv/math.hh>
     13#include <nv/core/math.hh>
    1414#include <nv/interface/animation_key.hh>
    1515#include <nv/interface/interpolation_raw.hh>
    1616#include <nv/interface/interpolation_template.hh>
    17 #include <nv/transform.hh>
     17#include <nv/core/transform.hh>
    1818#include <glm/gtc/matrix_transform.hpp>
    1919

  • trunk/nv/gfx/debug_draw.hh

    r313 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_DEBUG_DRAW_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212#include <nv/interface/context.hh>
    1313

  • trunk/nv/gfx/image.hh

    r228 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_IMAGE_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212#include <nv/interface/image_data.hh>
    1313

  • trunk/nv/gfx/keyframed_mesh.hh

    r314 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_KEYFRAMED_MESH_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/interface/context.hh>
    1212#include <nv/interface/animated_mesh.hh>

  • trunk/nv/gfx/mesh_creator.hh

    r304 r319  
    88#define NV_MESH_CREATOR_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212#include <nv/interface/mesh_data.hh>
    1313

  • trunk/nv/gfx/particle_engine.hh

    r312 r319  
     1// Copyright (C) 2014 ChaosForge Ltd
     2// http://chaosforge.org/
     3//
     4// This file is part of NV Libraries.
     5// For conditions of distribution and use, see copyright notice in nv.hh
     6
    17#ifndef NV_GFX_PARTICLE_ENGINE
    28#define NV_GFX_PARTICLE_ENGINE
    39
    4 #include <nv/common.hh>
    5 #include <nv/math.hh>
    6 #include <nv/array.hh>
    7 #include <nv/handle.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
     12#include <nv/core/array.hh>
     13#include <nv/core/handle.hh>
    814#include <nv/lua/lua_state.hh>
    915#include <nv/gfx/texture_atlas.hh>

  • trunk/nv/gfx/skeletal_mesh.hh

    r313 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_SKELETAL_MESH_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/interface/context.hh>
    1212#include <nv/interface/animated_mesh.hh>

  • trunk/nv/gfx/sliced_buffer.hh

    r302 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1111#define NV_SLICED_BUFFER_HH
    1212
    13 #include <nv/common.hh>
    14 #include <nv/math.hh>
    15 #include <nv/interface/vertex_buffer.hh>
     13#include <nv/core/common.hh>
     14#include <nv/core/math.hh>
    1615
    1716namespace nv
    … …  
    271270                static const int value_type_size = sizeof(T);
    272271
    273                 indexed_sliced_buffer( device* dev, buffer_hint hint, int initial_size, int initial_index_size )
    274                         : m_vertex_buffer( dev, VERTEX_BUFFER, hint, initial_size )
    275                         , m_index_buffer( dev, INDEX_BUFFER, hint, initial_index_size )
     272                indexed_sliced_buffer( context* ctx, buffer_hint hint, int initial_size, int initial_index_size )
     273                        : m_vertex_buffer( ctx, VERTEX_BUFFER, hint, initial_size )
     274                        , m_index_buffer( ctx, INDEX_BUFFER, hint, initial_index_size )
    276275                {
    277276
    … …  
    295294                int get_vertex_size()     const { return m_vertex_buffer.get_size(); }
    296295                int get_index_size()      const { return m_index_buffer.get_size(); }
    297                 buffer* get_buffer() { return m_vertex_buffer.get_buffer(); }
     296                buffer get_vertex_buffer() { return m_vertex_buffer.get_buffer(); }
     297                buffer get_index_buffer()  { return m_index_buffer.get_buffer(); }
    298298                sliced_vertex_buffer& get_vertex_cache() { return m_vertex_buffer; }
    299299                sliced_index_buffer&  get_index_cache()  { return m_index_buffer; }

  • trunk/nv/gfx/texture_atlas.hh

    r145 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010#define NV_TEXTURE_ATLAS_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/math.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/math.hh>
    1414#include <nv/gfx/image.hh>
    1515#include <vector>

  • trunk/nv/gfx/texture_font.hh

    r256 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_TEXTURE_FONT_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/string.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/string.hh>
    1212#include <unordered_map>
    13 #include <nv/math.hh>
     13#include <nv/core/math.hh>
    1414#include <nv/gfx/texture_atlas.hh>
    1515

  • trunk/nv/gl/gl_context.hh

    r313 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/gl/gl_device.hh

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/gl/gl_enum.hh

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_GL_ENUM_HH
    1414
    15 #include <nv/math.hh>
     15#include <nv/core/math.hh>
    1616#include <nv/interface/clear_state.hh>
    1717#include <nv/interface/render_state.hh>
    18 #include <nv/interface/vertex_buffer.hh>
    1918#include <nv/interface/image_data.hh>
    2019#include <nv/interface/context.hh>

  • trunk/nv/gl/gl_window.hh

    r295 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/gui/gui_common.hh

    r271 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_GUI_COMMON_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/handle.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/handle.hh>
    1818
    1919namespace nv

  • trunk/nv/gui/gui_element.hh

    r271 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_GUI_ELEMENT_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/position.hh>
    18 #include <nv/io_event.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/position.hh>
     18#include <nv/core/io_event.hh>
     19#include <nv/core/string.hh>
    1920#include <nv/gui/gui_common.hh>
     21#include <list>
    2022
    2123namespace nv

  • trunk/nv/gui/gui_environment.hh

    r318 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1717#include <nv/gui/gui_style.hh>
    1818#include <nv/lua/lua_state.hh>
    19 #include <nv/io_event.hh>
     19#include <nv/core/io_event.hh>
    2020#include <nv/interface/window.hh>
    21 #include <nv/array.hh>
     21#include <nv/core/array.hh>
    2222
    2323namespace nv

  • trunk/nv/gui/gui_renderer.hh

    r318 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_GUI_RENDERER_HH
    1515
    16 #include <nv/object.hh>
    17 #include <nv/position.hh>
    18 #include <nv/math.hh>
     16#include <nv/core/position.hh>
     17#include <nv/core/math.hh>
    1918#include <nv/gui/gui_common.hh>
    2019#include <nv/gui/gui_style.hh>

  • trunk/nv/gui/gui_style.hh

    r121 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/interface/animated_mesh.hh

    r296 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_ANIMATED_MESH_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/math.hh>
    18 #include <nv/transform.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/math.hh>
     18#include <nv/core/transform.hh>
    1919#include <nv/interface/context.hh>
    2020

  • trunk/nv/interface/animation_key.hh

    r286 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010#define NV_ANIMATION_KEY_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/transform.hh>
    14 #include <nv/math.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/transform.hh>
     14#include <nv/core/math.hh>
    1515
    1616namespace nv

  • trunk/nv/interface/audio.hh

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_AUDIO_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/math.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/math.hh>
    1717
    1818namespace nv

  • trunk/nv/interface/camera.hh

    r267 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_CAMERA_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/math.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/math.hh>
    1717
    1818namespace nv

  • trunk/nv/interface/clear_state.hh

    r214 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_CLEAR_STATE_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/math.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/math.hh>
    1818
    1919namespace nv

  • trunk/nv/interface/context.hh

    r314 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_CONTEXT_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/device.hh>
    1717#include <nv/interface/camera.hh>
    18 #include <nv/interface/vertex_buffer.hh>
    1918#include <nv/interface/clear_state.hh>
    2019#include <nv/interface/render_state.hh>

  • trunk/nv/interface/device.hh

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_DEVICE_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/string.hh>
    17 #include <nv/handle.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/string.hh>
     17#include <nv/core/handle.hh>
    1818#include <nv/interface/uniform.hh>
    1919#include <nv/interface/mesh_data.hh>
    20 #include <nv/interface/vertex_buffer.hh>
    2120#include <nv/interface/image_data.hh>
    2221

  • trunk/nv/interface/file_system.hh

    r135 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_FILE_SYSTEM_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/stream.hh>
    1717

  • trunk/nv/interface/font.hh

    r230 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_GL_FONT_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212#include <unordered_map>
    1313

  • trunk/nv/interface/image_data.hh

    r292 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_IMAGE_DATA_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/math.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/math.hh>
    1818#include <algorithm>
    1919

  • trunk/nv/interface/interpolation_raw.hh

    r293 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010#define NV_INTERPOLATION_RAW_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/transform.hh>
    14 #include <nv/math.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/transform.hh>
     14#include <nv/core/math.hh>
    1515#include <nv/interface/animation_key.hh>
    1616

  • trunk/nv/interface/interpolation_template.hh

    r286 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010#define NV_INTERPOLATION_TEMPLATE_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/transform.hh>
    14 #include <nv/math.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/transform.hh>
     14#include <nv/core/math.hh>
    1515#include <nv/interface/animation_key.hh>
    1616

  • trunk/nv/interface/map_area.hh

    r298 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_MAP_AREA_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/string.hh>
    17 #include <nv/array.hh>
    18 #include <nv/position.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/string.hh>
     17#include <nv/core/array.hh>
     18#include <nv/core/position.hh>
    1919
    2020namespace nv

  • trunk/nv/interface/mesh_data.hh

    r304 r319  
    88#define NV_MESH_DATA_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
    12 #include <nv/string.hh>
    13 #include <nv/array.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
     12#include <nv/core/string.hh>
     13#include <nv/core/array.hh>
    1414#include <nv/gfx/animation.hh>
    1515#include <nv/interface/vertex.hh>

  • trunk/nv/interface/mesh_loader.hh

    r293 r319  
    1414#define NV_MESH_LOADER_HH
    1515
    16 #include <nv/common.hh>
    17 #include <vector>
     16#include <nv/core/common.hh>
     17#include <nv/core/array.hh>
    1818#include <unordered_map>
    19 #include <nv/transform.hh>
    20 #include <nv/string.hh>
     19#include <nv/core/transform.hh>
     20#include <nv/core/string.hh>
    2121#include <nv/gfx/animation.hh>
    2222#include <nv/interface/mesh_data.hh>

  • trunk/nv/interface/render_state.hh

    r233 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_RENDER_STATE_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/math.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/math.hh>
    1818#include <nv/interface/clear_state.hh>
    19 #include <nv/string.hh>
     19#include <nv/core/string.hh>
    2020
    2121namespace nv

  • trunk/nv/interface/scene_node.hh

    r275 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_SCENE_NODE_HH
    1414
    15 #include <nv/common.hh>
    16 #include <vector>
    17 #include <nv/transform.hh>
    18 #include <nv/math.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/array.hh>
     17#include <nv/core/transform.hh>
     18#include <nv/core/math.hh>
    1919#include <nv/interface/render_state.hh>
    2020

  • trunk/nv/interface/stream.hh

    r279 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_STREAM_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616
    1717namespace nv

  • trunk/nv/interface/terminal.hh

    r222 r319  
    1 // Copyright (C) 2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2013-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_TERMINAL_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/position.hh>
    17 #include <nv/io_event.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/position.hh>
     17#include <nv/core/io_event.hh>
    1818
    1919namespace nv

  • trunk/nv/interface/uniform.hh

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_UNIFORM_HH
    1414
     15#include <nv/interface/camera.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/string.hh>
    1518#include <unordered_map>
    16 #include <nv/interface/camera.hh>
    17 #include <nv/common.hh>
    18 #include <nv/string.hh>
    1919
    2020namespace nv

  • trunk/nv/interface/vertex.hh

    r302 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010#define NV_VERTEX_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/transform.hh>
    14 #include <nv/math.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/transform.hh>
     14#include <nv/core/math.hh>
    1515
    1616namespace nv

  • trunk/nv/interface/window.hh

    r121 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1010 */
    1111
    12 #ifndef NV_WINDOW_HH
    13 #define NV_WINDOW_HH
     12#ifndef NV_GUI_WINDOW_HH
     13#define NV_GUI_WINDOW_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/string.hh>
    17 #include <nv/io_event.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/string.hh>
     17#include <nv/core/io_event.hh>
    1818
    1919namespace nv
    … …  
    3939
    4040
    41 #endif // NV_WINDOW_HH
     41#endif // NV_GUI_WINDOW_HH

  • trunk/nv/io/c_file_system.hh

    r124 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_C_FILE_SYSTEM_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/file_system.hh>
    1717

  • trunk/nv/io/c_stream.hh

    r279 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_C_STREAM_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/stream.hh>
    1717

  • trunk/nv/io/std_stream.hh

    r138 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_STD_STREAM_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/stream.hh>
    1717#include <streambuf>

  • trunk/nv/io/string_table.hh

    r281 r319  
    1313#define NV_IO_STRING_TABLE_HH
    1414
    15 #include <nv/common.hh>
    16 #include <nv/array.hh>
     15#include <nv/core/common.hh>
     16#include <nv/core/array.hh>
    1717#include <unordered_map>
    1818#include <nv/interface/stream.hh>

  • trunk/nv/lib/assimp.hh

    r247 r319  
    88#define NV_LIB_ASSIMP_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/logging.hh>
    12 #include <nv/string.hh>
    13 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/logging.hh>
     12#include <nv/core/string.hh>
     13#include <nv/core/math.hh>
    1414
    1515#define NV_ASSIMP_DYNAMIC

  • trunk/nv/lib/curses.hh

    r218 r319  
    1 // Copyright (C) 2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_CURSES_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111
    1212#define NV_CURSES_DYNAMIC

  • trunk/nv/lib/fmod.hh

    r197 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_FMOD_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111
    1212#define NV_FMOD_DYNAMIC

  • trunk/nv/lib/freetype2.hh

    r167 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1212#include <stddef.h>
    1313
    14 #include <nv/common.hh>
     14#include <nv/core/common.hh>
    1515
    1616#define NV_FREETYPE_DYNAMIC

  • trunk/nv/lib/gl.hh

    r311 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_GL_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111
    1212#if NV_PLATFORM == NV_WINDOWS

  • trunk/nv/lib/lua.hh

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    3333******************************************************************************/
    3434
    35 #include <nv/common.hh>
     35#include <nv/core/common.hh>
    3636
    3737#define NV_LUA_DYNAMIC

  • trunk/nv/lib/sdl.hh

    r245 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_SDL_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111
    1212#define NV_SDL_DYNAMIC

  • trunk/nv/lib/sdl_image.hh

    r171 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_SDL_IMAGE_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/lib/sdl.hh>
    1212

  • trunk/nv/lib/sdl_mixer.hh

    r193 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LIB_SDL_MIXER_HH
    99
    10 #include <nv/common.hh>
     10#include <nv/core/common.hh>
    1111#include <nv/lib/sdl.hh>
    1212

  • trunk/nv/lib/wx.hh

    r310 r319  
    1919#undef near
    2020#undef far
    21 #include <nv/common.hh>
     21#include <nv/core/common.hh>
    2222#include <nv/lib/gl.hh>
    2323#include <nv/gl/gl_device.hh>

  • trunk/nv/lua/lua_area.hh

    r209 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#define NV_LUA_AREA_HH
    88
    9 #include <nv/common.hh>
    10 #include <nv/position.hh>
     9#include <nv/core/common.hh>
     10#include <nv/core/position.hh>
    1111#include <nv/lua/lua_glm.hh>
    1212#include <nv/lua/lua_state.hh>

  • trunk/nv/lua/lua_aux.hh

    r207 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/lua/lua_dispatch.hh

    r262 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1414#define NV_LUA_DISPATCH_HH
    1515
    16 #include <nv/common.hh>
    17 #include <nv/string.hh>
     16#include <nv/core/common.hh>
     17#include <nv/core/string.hh>
    1818#include <nv/lua/lua_values.hh>
    1919#include <nv/lua/lua_path.hh>

  • trunk/nv/lua/lua_flags.hh

    r215 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#define NV_LUA_FLAGS_HH
    88
    9 #include <nv/common.hh>
    10 #include <nv/flags.hh>
     9#include <nv/core/common.hh>
     10#include <nv/core/flags.hh>
    1111#include <nv/lua/lua_state.hh>
    1212#include <nv/lua/lua_values.hh>

  • trunk/nv/lua/lua_function.hh

    r253 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LUA_FUNCTION_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/string.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/string.hh>
    1212#include <nv/lua/lua_values.hh>
    1313#include <nv/lua/lua_path.hh>

  • trunk/nv/lua/lua_glm.hh

    r208 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include <new>
    10 #include <nv/common.hh>
    11 #include <nv/math.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/math.hh>
    1212#include <nv/lua/lua_values.hh>
    1313

  • trunk/nv/lua/lua_map_area.hh

    r265 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/lua/lua_map_tile.hh

    r221 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_LUA_MAP_TILE_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/lua/lua_state.hh>
    1717

  • trunk/nv/lua/lua_nova.hh

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/nv/lua/lua_path.hh

    r204 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LUA_PATH_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/string.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/string.hh>
    1212#include <cstring>
    1313

  • trunk/nv/lua/lua_raw.hh

    r220 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#define NV_LUA_RAW_HH
    88
    9 #include <nv/common.hh>
     9#include <nv/core/common.hh>
    1010#include <nv/lib/lua.hh>
    1111#include <istream>

  • trunk/nv/lua/lua_state.hh

    r305 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99
    1010
    11 #ifndef NV_LUA_HH
    12 #define NV_LUA_HH
    13 
    14 #include <nv/common.hh>
     11#ifndef NV_LUA_STATE_HH
     12#define NV_LUA_STATE_HH
     13
     14#include <nv/core/common.hh>
     15#include <nv/core/flags.hh>
    1516#include <istream>
    1617#include <map>
    17 #include <nv/flags.hh>
    1818
    1919#include <nv/lua/lua_path.hh>
    … …  
    273273} // namespace nv
    274274
    275 #endif // NV_LUA_HH
     275#endif // NV_LUA_STATE_HH

  • trunk/nv/lua/lua_values.hh

    r305 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88#define NV_LUA_VALUES_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/type_traits.hh>
    12 #include <nv/string.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/type_traits.hh>
     12#include <nv/core/string.hh>
    1313
    1414struct lua_State;

  • trunk/nv/rogue/fov.hh

    r298 r319  
    1010#define NV_ROGUE_FOV_HH
    1111
    12 #include <nv/common.hh>
    13 #include <nv/position.hh>
     12#include <nv/core/common.hh>
     13#include <nv/core/position.hh>
    1414#include <nv/interface/map_area.hh>
    1515

  • trunk/nv/rogue/fov_recursive_shadowcasting.hh

    r298 r319  
    88#define NV_ROGUE_FOV_RECURSIVE_SHADOWCASTING_HH
    99
    10 #include <nv/common.hh>
    11 #include <nv/position.hh>
     10#include <nv/core/common.hh>
     11#include <nv/core/position.hh>
    1212#include <nv/rogue/fov.hh>
    1313

  • trunk/nv/sdl/sdl_audio.hh

    r194 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    1313#define NV_SDL_AUDIO_HH
    1414
    15 #include <nv/common.hh>
     15#include <nv/core/common.hh>
    1616#include <nv/interface/audio.hh>
    1717

  • trunk/src/core/io_event.cc

    r304 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #include "nv/io_event.hh"
    8 
    9 #include <nv/types.hh>
     7#include "nv/core/io_event.hh"
    108
    119using namespace nv;
    … …  
    4442}
    4543
     44/************************************************************************
    4645void nv::register_io_types( type_database* db )
    4746{
    … …  
    138137        db->create_type<system_event>("system_event").fields( system_fields );
    139138}
     139************************************************************************/

  • trunk/src/core/library.cc

    r295 r319  
    1 // Copyright (C) 2012 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    4 #include "nv/common.hh"
    5 #include "nv/library.hh"
     4#include "nv/core/common.hh"
     5#include "nv/core/library.hh"
    66
    77#if NV_PLATFORM == NV_WINDOWS
    … …  
    3030#endif
    3131
    32 #include "nv/logging.hh"
     32#include "nv/core/logging.hh"
    3333
    3434using namespace nv;

  • trunk/src/core/logger.cc

    r295 r319  
    1 // Copyright (C) 2011 Kornel Kisielewicz
     1// Copyright (C) 2011-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    44
    5 #include "nv/logger.hh"
    6 
    7 #include "nv/common.hh"
     5#include "nv/core/logger.hh"
     6
     7#include "nv/core/common.hh"
    88#include <iostream>
    99#include <utility>
    … …  
    1212#include <ctime>
    1313#include <cstdio>
    14 #include <nv/exception.hh>
     14#include "nv/core/exception.hh"
    1515#if NV_PLATFORM == NV_WINDOWS
    1616#define WIN32_LEAN_AND_MEAN

  • trunk/src/core/profiler.cc

    r205 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    44
    5 #include "nv/profiler.hh"
     5#include "nv/core/profiler.hh"
    66
    77#include <iomanip>
    88#include <ios>
    9 #include "nv/time.hh"
     9#include "nv/core/time.hh"
    1010
    1111using namespace nv;

  • trunk/src/core/random.cc

    r308 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #include "nv/random.hh"
    8 #include "nv/time.hh"
     7#include "nv/core/random.hh"
     8#include "nv/core/time.hh"
    99
    1010using namespace nv;

  • trunk/src/core/time.cc

    r205 r319  
    1 // Copyright (C) 2011 Kornel Kisielewicz
     1// Copyright (C) 2011-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    44
    5 #include "nv/time.hh"
     5#include "nv/core/time.hh"
    66
    7 #include "nv/logging.hh"
     7#include "nv/core/logging.hh"
    88
    99#if NV_COMPILER == NV_MSVC

  • trunk/src/core/uid.cc

    r266 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #include "nv/uid.hh"
     7#include "nv/core/uid.hh"
    88
    99using namespace nv;

  • trunk/src/curses/curses_terminal.cc

    r222 r319  
    1 // Copyright (C) 2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2013-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#include "nv/curses/curses_terminal.hh"
    88
    9 #include "nv/time.hh"
     9#include "nv/core/time.hh"
    1010#include "nv/lib/curses.hh"
    1111

  • trunk/src/engine/program_manager.cc

    r317 r319  
    66
    77#include "nv/engine/program_manager.hh"
    8 #include "nv/range.hh"
     8#include "nv/core/range.hh"
    99#include "nv/lua/lua_nova.hh"
    1010

  • trunk/src/engine/resource_system.cc

    r316 r319  
    66
    77#include "nv/engine/resource_system.hh"
    8 #include "nv/range.hh"
     8#include "nv/core/range.hh"
    99#include "nv/lua/lua_nova.hh"
    1010
    … …  
    3838}
    3939
    40 nv::resource_type_id nv::resource_system::register_resource_type( const string& name, resource_manager_base* manager )
     40nv::resource_type_id nv::resource_system::register_resource_type( const string& /*name*/, resource_manager_base* /*manager*/ )
    4141{
    4242        return 0;
    4343}
    4444
    45 nv::resource_type_id nv::resource_system::get_resource_type_id( const string& name ) const
     45nv::resource_type_id nv::resource_system::get_resource_type_id( const string& /*name*/ ) const
    4646{
    4747        return 0;
    4848}
    4949
    50 void nv::resource_system::initialize( lua::state* a_lua_state )
     50void nv::resource_system::initialize( lua::state* /*a_lua_state*/ )
    5151{
    5252

  • trunk/src/fmod/fmod_audio.cc

    r194 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include "nv/lib/fmod.hh"
    10 #include "nv/logging.hh"
     10#include "nv/core/logging.hh"
    1111
    1212using namespace nv;

  • trunk/src/formats/md2_loader.cc

    r287 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include <glm/gtc/constants.hpp>
    10 #include "nv/logging.hh"
     10#include "nv/core/logging.hh"
    1111#include <cstring>
    1212

  • trunk/src/formats/md3_loader.cc

    r304 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include <glm/gtc/constants.hpp>
    10 #include "nv/logging.hh"
     10#include "nv/core/logging.hh"
    1111#include <cstring>
    1212

  • trunk/src/formats/md5_loader.cc

    r291 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
    2 // http://chaosforge.org/
    3 //
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    42// This file is part of NV Libraries.
    53// For conditions of distribution and use, see copyright notice in nv.hh
    … …  
    86
    97#include <glm/gtc/constants.hpp>
    10 #include "nv/logging.hh"
     8#include "nv/core/logging.hh"
    119#include "nv/io/std_stream.hh"
    1210#include <cstring>

  • trunk/src/formats/nmd_loader.cc

    r292 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#include "nv/formats/nmd_loader.hh"
    88#include "nv/io/std_stream.hh"
    9 #include "nv/string.hh"
     9#include "nv/core/string.hh"
    1010
    1111using namespace nv;

  • trunk/src/formats/obj_loader.cc

    r287 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/gfx/debug_draw.cc

    r313 r319  
    1 // Copyright (C) 2014 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/gfx/image.cc

    r228 r319  
    1 // Copyright (C) 2011 Kornel Kisielewicz
     1// Copyright (C) 2011-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/gfx/keyframed_mesh.cc

    r314 r319  
    1 // Copyright (C) 2011 Kornel Kisielewicz
     1// Copyright (C) 2011-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    … …  
    1111
    1212
    13 #include "nv/logging.hh"
     13#include "nv/core/logging.hh"
    1414
    1515using namespace nv;

  • trunk/src/gfx/particle_engine.cc

    r313 r319  
     1// Copyright (C) 2014 ChaosForge Ltd
     2// This file is part of NV Libraries.
     3// For conditions of distribution and use, see copyright notice in nv.hh
     4
    15#include "nv/gfx/particle_engine.hh"
    26
    37#include <nv/interface/device.hh>
    4 #include <nv/random.hh>
     8#include <nv/core/random.hh>
    59#include <nv/lua/lua_glm.hh>
    6 #include <nv/logging.hh>
     10#include <nv/core/logging.hh>
    711#include <cmath>
    812

  • trunk/src/gfx/skeletal_mesh.cc

    r313 r319  
    1 // Copyright (C) 2011 Kornel Kisielewicz
     1// Copyright (C) 2011-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/gfx/texture_atlas.cc

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#include "nv/gfx/texture_atlas.hh"
    88
    9 #include "nv/logging.hh"
     9#include "nv/core/logging.hh"
    1010#include <iostream>
    1111

  • trunk/src/gfx/texture_font.cc

    r256 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/gl/gl_context.cc

    r313 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/gl/gl_device.cc

    r316 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    … …  
    66
    77#include "nv/gl/gl_window.hh"
    8 #include "nv/logging.hh"
     8#include "nv/core/logging.hh"
    99#include "nv/lib/sdl.hh"
    1010#include "nv/lib/sdl_image.hh"

  • trunk/src/gl/gl_enum.cc

    r316 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/gl/gl_window.cc

    r310 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh
    … …  
    55#include "nv/gl/gl_window.hh"
    66
    7 #include "nv/logging.hh"
     7#include "nv/core/logging.hh"
    88#include "nv/lib/gl.hh"
    99#include "nv/lib/sdl.hh"

  • trunk/src/gui/gui_environment.cc

    r318 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/gui/gui_renderer.cc

    r318 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/gui/gui_style.cc

    r268 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/io/c_file_system.cc

    r128 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/io/c_stream.cc

    r279 r319  
    1 // Copyright (C) 2012-2013 Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// This file is part of NV Libraries.
    33// For conditions of distribution and use, see copyright notice in nv.hh

  • trunk/src/io/std_stream.cc

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/lib/assimp.cc

    r250 r319  
    2323#if defined( NV_ASSIMP_DYNAMIC )
    2424
    25 #include "nv/library.hh"
     25#include "nv/core/library.hh"
    2626
    2727#define NV_ASSIMP_FUN( rtype, fname, fparams ) rtype (NV_ASSIMP_APIENTRY *fname) fparams = nullptr;

  • trunk/src/lib/curses.cc

    r218 r319  
    1 // Copyright (C) 2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2013-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_CURSES_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_CURSES_FUN( rtype, fname, fparams ) rtype (*fname) fparams = nullptr;

  • trunk/src/lib/fmod.cc

    r203 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_FMOD_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_FMOD_FUN( rtype, fname, fparams ) rtype (NV_FMOD_APIENTRY *fname) fparams = nullptr;

  • trunk/src/lib/freetype2.cc

    r167 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_FREETYPE_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_FREETYPE_FUN( rtype, fname, fparams ) rtype (*fname) fparams = nullptr;

  • trunk/src/lib/gl.cc

    r311 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    55// For conditions of distribution and use, see copyright notice in nv.hh
    66
    7 #include "nv/common.hh"
    8 #include "nv/range.hh"
     7#include "nv/core/common.hh"
     8#include "nv/core/range.hh"
    99#include "nv/lib/gl.hh"
    1010
    1111#if defined( NV_GL_DYNAMIC )
    1212
    13 #include "nv/library.hh"
     13#include "nv/core/library.hh"
    1414
    1515#if defined( NV_SDL_GL )

  • trunk/src/lib/lua.cc

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_LUA_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#if NV_LUA_VERSION == NV_LUA_52

  • trunk/src/lib/sdl.cc

    r171 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_SDL_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_SDL_FUN( rtype, fname, fparams ) rtype (NV_SDL_APIENTRY *fname) fparams = nullptr;

  • trunk/src/lib/sdl_image.cc

    r168 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_SDL_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_SDL_FUN( rtype, fname, fparams ) rtype (NV_SDL_APIENTRY *fname) fparams = nullptr;

  • trunk/src/lib/sdl_mixer.cc

    r194 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#if defined( NV_SDL_DYNAMIC )
    1010
    11 #include "nv/library.hh"
     11#include "nv/core/library.hh"
    1212
    1313#define NV_SDL_FUN( rtype, fname, fparams ) rtype (NV_SDL_APIENTRY *fname) fparams = nullptr;

  • trunk/src/lua/lua_area.cc

    r207 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include "nv/lua/lua_raw.hh"
    10 #include "nv/string.hh"
    11 #include "nv/random.hh"
     10#include "nv/core/string.hh"
     11#include "nv/core/random.hh"
    1212
    1313const char* nv::lua::detail::AREA_METATABLE = "area";

  • trunk/src/lua/lua_aux.cc

    r207 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#include <utility>
    1010#include "nv/lua/lua_raw.hh"
    11 #include "nv/random.hh"
     11#include "nv/core/random.hh"
    1212
    1313static int nluaaux_table_copy( lua_State* L )

  • trunk/src/lua/lua_flags.cc

    r215 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include "nv/lua/lua_raw.hh"
    10 #include "nv/string.hh"
     10#include "nv/core/string.hh"
    1111
    1212

  • trunk/src/lua/lua_function.cc

    r198 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/lua/lua_glm.cc

    r207 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    88
    99#include "nv/lua/lua_raw.hh"
    10 #include "nv/string.hh"
    11 #include "nv/random.hh"
     10#include "nv/core/string.hh"
     11#include "nv/core/random.hh"
    1212
    1313static size_t nlua_swizzel_lookup[256];

  • trunk/src/lua/lua_map_area.cc

    r265 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    66
    77#include "nv/lua/lua_map_area.hh"
    8 #include "nv/flags.hh"
     8#include "nv/core/flags.hh"
    99#include "nv/lua/lua_area.hh"
    1010#include "nv/lua/lua_glm.hh"

  • trunk/src/lua/lua_map_tile.cc

    r228 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#include <numeric>
    1010#include "nv/lua/lua_map_area.hh"
    11 #include "nv/flags.hh"
    12 #include "nv/random.hh"
     11#include "nv/core/flags.hh"
     12#include "nv/core/random.hh"
    1313#include "nv/lua/lua_area.hh"
    1414#include "nv/lua/lua_glm.hh"

  • trunk/src/lua/lua_nova.cc

    r316 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/lua/lua_path.cc

    r204 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/lua/lua_raw.cc

    r220 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#include "nv/lua/lua_raw.hh"
    88
    9 #include "nv/string.hh"
     9#include "nv/core/string.hh"
    1010
    1111std::string nlua_typecontent( lua_State* L, int idx )

  • trunk/src/lua/lua_state.cc

    r305 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#include "nv/lua/lua_raw.hh"
    1010#include "nv/lua/lua_nova.hh"
    11 #include "nv/logging.hh"
    12 #include "nv/string.hh"
     11#include "nv/core/logging.hh"
     12#include "nv/core/string.hh"
    1313
    1414using namespace nv;

  • trunk/src/lua/lua_values.cc

    r265 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//

  • trunk/src/rogue/fov_recursive_shadowcasting.cc

    r276 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    77#include "nv/rogue/fov_recursive_shadowcasting.hh"
    88
    9 #include <nv/math.hh>
     9#include "nv/core/math.hh"
    1010
    1111static int nv_rogue_rs_mult[4][8] = {

  • trunk/src/sdl/sdl_audio.cc

    r202 r319  
    1 // Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
     1// Copyright (C) 2012-2014 ChaosForge Ltd
    22// http://chaosforge.org/
    33//
    … …  
    99#include "nv/lib/sdl.hh"
    1010#include "nv/lib/sdl_mixer.hh"
    11 #include "nv/logging.hh"
     11#include "nv/core/logging.hh"
    1212
    1313using namespace nv;

  • trunk/tests/cachebuf_test/nv_cachebuf_test.cc

    r214 r319  
    1 #include <nv/interface/vertex_buffer.hh>
    21#include <nv/gl/gl_device.hh>
    32#include <nv/gfx/image.hh>
    43#include <nv/interface/context.hh>
    54#include <nv/interface/window.hh>
    6 #include <nv/interface/program.hh>
    7 #include <nv/interface/texture2d.hh>
    8 #include <nv/logging.hh>
    9 #include <nv/logger.hh>
     5#include <nv/core/logging.hh>
     6#include <nv/core/logger.hh>
    107#include <glm/glm.hpp>
    118#include <glm/gtc/matrix_transform.hpp>
    129#include <glm/gtc/type_ptr.hpp>
    13 #include <nv/string.hh>
    14 #include <nv/interface/mesh.hh>
     10#include <nv/core/string.hh>
    1511#include <cstdlib> // rand
    1612#include <ctime> // time
    … …  
    222218        ~application();
    223219protected:
    224         nv::device* m_device;
    225         nv::window* m_window;
     220        nv::device*  m_device;
     221        nv::context* m_context;
     222        nv::window*  m_window;
    226223        nv::clear_state m_clear_state;
    227224        nv::render_state m_render_state;
    … …  
    230227        std::vector<app_window>  m_windows;
    231228
    232         nv::program* m_program;
    233         nv::vertex_array* m_va;
     229        nv::program      m_program;
     230        nv::vertex_array  m_va;
    234231        unsigned int m_count;
    235232};
    … …  
    237234application::application()
    238235{
    239         m_device = new nv::gl_device();
    240         m_window = m_device->create_window( 800, 600 );
     236        m_device  = new nv::gl_device();
     237        m_window  = m_device->create_window( 800, 600, false );
     238        m_context = m_window->get_context();
    241239
    242240        m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER;
    … …  
    254252        {
    255253                m_program   = m_device->create_program( nv::slurp( "cachebuf.vert" ), nv::slurp( "cachebuf.frag" ) );
    256                 m_va        = m_device->create_vertex_array();
    257 
    258                 #ifdef INDEXED_TEST
    259                 m_quad_cache = new gcache( m_device, nv::DYNAMIC_DRAW, 200, 200 );
    260                 m_va->set_index_buffer( m_quad_cache->get_index_buffer(), nv::USHORT, false );
    261                 nv::vertex_buffer* buffer = m_quad_cache->get_vertex_buffer();
    262                 #else
    263                 m_quad_cache = new gcache( m_device, nv::DYNAMIC_DRAW, 20, true );
    264                 nv::vertex_buffer* buffer = (nv::vertex_buffer*)m_quad_cache->get_buffer();
    265                 #endif
    266 
    267                 m_va->add_vertex_buffer( nv::slot::POSITION, buffer, nv::INT,   2, 0, sizeof( vertex ), false );
    268                 m_va->add_vertex_buffer( nv::slot::COLOR,    buffer, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
     254                m_va        = m_context->create_vertex_array();
     255
     256                #ifdef INDEXED_TEST
     257                m_quad_cache = new gcache( m_context, nv::DYNAMIC_DRAW, 200, 200 );
     258                m_context->set_index_buffer( m_va, m_quad_cache->get_index_buffer(), nv::USHORT, false );
     259                nv::buffer buffer = m_quad_cache->get_vertex_buffer();
     260                #else
     261                m_quad_cache = new gcache( m_context, nv::DYNAMIC_DRAW, 20, true );
     262                nv::buffer buffer = m_quad_cache->get_buffer();
     263                #endif
     264
     265                m_context->add_vertex_buffer( m_va, nv::slot::POSITION, buffer, nv::INT,   2, 0, sizeof( vertex ), false );
     266                m_context->add_vertex_buffer( m_va, nv::slot::COLOR,    buffer, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
    269267        }
    270268        return true;
    … …  
    274272{
    275273        int keypress = 0;
    276         m_program->bind();
    277274        glm::mat4 projection = glm::ortho( 0.0f, 800.0f, 600.0f, 0.0f, -1.0f, 1.0f );
    278         m_program->set_uniform( "nv_projection", glm::mat4(projection) );
     275        m_device->set_uniform( m_program, "nv_projection", glm::mat4(projection) );
    279276
    280277        while(!keypress)
    … …  
    287284                {
    288285                        #ifdef INDEXED_TEST
    289                         m_va->set_index_buffer( m_quad_cache->get_index_buffer() );
    290                         nv::vertex_buffer* buffer = m_quad_cache->get_vertex_buffer();
     286                        m_context->set_index_buffer( m_va, m_quad_cache->get_index_buffer(), nv::USHORT, false );
     287                        nv::buffer buffer = m_quad_cache->get_vertex_buffer();
    291288                        #else
    292                         nv::vertex_buffer* buffer = (nv::vertex_buffer*)m_quad_cache->get_buffer();
     289                        nv::buffer buffer = m_quad_cache->get_buffer();
    293290                        #endif
    294                         m_va->update_vertex_buffer( nv::slot::POSITION, buffer, false );
    295                         m_va->update_vertex_buffer( nv::slot::COLOR,    buffer, false );
    296291                }
    297292
    298293                m_window->get_context()->clear( m_clear_state );
    299                 m_program->bind();
    300294//              m_program->set_uniform( "tex", 0 );
    301295                #ifdef INDEXED_TEST
    … …  
    369363        delete m_quad_cache;
    370364
    371         delete m_program;
    372         delete m_va;
     365        m_device->release( m_program );
     366        m_context->release( m_va );
    373367        delete m_window;
    374368        delete m_device;

  • trunk/tests/gui_test/nv_gui_test.cc

    r269 r319  
    22#include <nv/gui/gui_environment.hh>
    33#include <nv/interface/context.hh>
    4 #include <nv/logging.hh>
    5 #include <nv/logger.hh>
     4#include <nv/core/logging.hh>
     5#include <nv/core/logger.hh>
    66#include <cstdlib> // rand
    77#include <ctime> // time

  • trunk/tests/md3_test/md3_test.cc

    r304 r319  
    1 #include <nv/common.hh>
     1#include <nv/core/common.hh>
    22#include <iomanip>
    33#include <nv/gfx/keyframed_mesh.hh>
    4 #include <nv/interface/vertex_buffer.hh>
    54#include <nv/gl/gl_device.hh>
    65#include <nv/gfx/image.hh>
    … …  
    109#include <nv/io/c_file_system.hh>
    1110#include <nv/formats/md3_loader.hh>
    12 #include <nv/profiler.hh>
    13 #include <nv/logging.hh>
    14 #include <nv/logger.hh>
    15 #include <nv/math.hh>
    16 #include <nv/time.hh>
    17 #include <nv/string.hh>
     11#include <nv/core/profiler.hh>
     12#include <nv/core/logging.hh>
     13#include <nv/core/logger.hh>
     14#include <nv/core/math.hh>
     15#include <nv/core/time.hh>
     16#include <nv/core/string.hh>
    1817#include <glm/gtx/rotate_vector.hpp>
    1918#include <glm/gtc/matrix_access.hpp>
    … …  
    6867        void update( nv::uint32 ms, nv::program program )
    6968        {
    70                 m_mesh->update( ms );
    7169                m_mesh->update_animation( m_entry, ms );
    7270                m_mesh->update( program );
    … …  
    206204
    207205                        m_scene_state.set_model( model );
    208                         m_window->get_context()->draw( m_render_state, m_scene_state, m_program, m_legs->get_mesh() );
     206                        m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_legs->get_mesh()->get_vertex_array(), m_legs->get_mesh()->get_index_count() );
    209207
    210208                        //model = m_legs->get_transform( "tag_torso", last_legs_frame, legs_frame, legs_interpolate );
    211209                        model = m_legs->get_transform( 0 );
    212210                        m_scene_state.set_model( model );
    213                         m_window->get_context()->draw( m_render_state, m_scene_state, m_program, m_torso->get_mesh() );
     211                        m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_torso->get_mesh()->get_vertex_array(), m_torso->get_mesh()->get_index_count() );
    214212
    215213                        glm::mat4 head = model * m_torso->get_transform( 0 ); //, last_torso_frame, torso_frame, torso_interpolate );
    216214                        m_scene_state.set_model( head );
    217                         m_window->get_context()->draw( m_render_state, m_scene_state, m_program, m_head->get_mesh() );
     215                        m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_head->get_mesh()->get_vertex_array(), m_head->get_mesh()->get_index_count() );
    218216
    219217                        glm::mat4 weapon = model * m_torso->get_transform( 2 ); //, last_torso_frame, torso_frame, torso_interpolate );
    220218                        m_scene_state.set_model( weapon );
    221219                        m_context->bind( m_diffuse_weapon, nv::TEX_DIFFUSE );
    222                         m_context->draw( m_render_state, m_scene_state, m_program, m_weapon->get_mesh() );
     220                        m_context->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_weapon->get_mesh()->get_vertex_array(), m_weapon->get_mesh()->get_index_count() );
    223221
    224222                }
Note: See TracChangeset for help on using the changeset viewer.