Changeset 1510


Ignore:
Timestamp:
Jun 22, 2012, 5:13:30 PM (11 years ago)
Author:
sam
Message:

easymesh: move the Mesh builder into the engine core.

Location:
trunk
Files:
9 added
4 deleted
15 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r1447 r1510  
    4444          lolremez-$(LOLREMEZ_VERSION)/
    4545        cp $(top_srcdir)/src/lol/math/real.h \
    46            $(top_srcdir)/src/lol/math/matrix.h \
     46           $(top_srcdir)/src/lol/math/vector.h \
    4747           $(top_srcdir)/src/lol/math/remez.h \
    4848          lolremez-$(LOLREMEZ_VERSION)/lol/math/

  • trunk/orbital/Lolnament.h

    r1504 r1510  
    384384private:
    385385        //mesh used to render Lolnament
    386     Mesh m_ref_mesh;
     386    EasyMesh m_ref_mesh;
    387387        //List of Pos/Rot/Etc... currently applied to the Lolnament's meshes.
    388388        Array<transient_infos> m_point_list;

  • trunk/orbital/Makefile.am

    r1479 r1510  
    66    particlesystem.h tank.h player.h gun.h snake.h starfield.h \
    77    \
    8     shiny.lolfx \
     8    Lolnament.h \
    99    \
    10     mesh.cpp mesh.h mesh-compiler.cpp mesh-compiler.h \
    11     generated/mesh-scanner.cpp generated/mesh-parser.cpp \
     10    generated/location.hh generated/position.hh generated/stack.hh \
    1211    \
    1312    gun.cpp gun.h gun-compiler.cpp gun-compiler.h \
    14     generated/gun-scanner.cpp generated/gun-parser.cpp
     13    generated/gun-scanner.cpp \
     14    generated/gun-parser.cpp generated/gun-parser.h
    1515orbital_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    1616orbital_LDADD =
    … …  
    2525        $(MKDIR_P) generated
    2626        rm -f generated/[a-zA-Z]*
    27         flex -o generated/mesh-scanner.cpp mesh-scanner.l
    2827        flex -o generated/gun-scanner.cpp gun-scanner.l
    29         bison -o generated/mesh-parser.cpp --defines=generated/mesh-parser.h \
    30               -d -b generated/mesh mesh-parser.y
    3128        bison -o generated/gun-parser.cpp --defines=generated/gun-parser.h \
    3229              -d -b generated/gun gun-parser.y
    … …  
    3431endif
    3532
    36 EXTRA_DIST = mesh-scanner.l mesh-parser.y \
    37              gun-scanner.l gun-parser.y
     33EXTRA_DIST = gun-scanner.l gun-parser.y
    3834CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
    3935             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \

  • trunk/orbital/orbital.h

    r1492 r1510  
    1010#define __ORBITAL_H__
    1111
    12 #include "mesh.h"
    1312#include "particlesystem.h"
    1413#include "gun.h"
    … …  
    3231
    3332private:
    34     Mesh m;
     33    EasyMesh m;
    3534    float m_auto_cam_timer;
    3635    vec3 m_angular_velocity;

  • trunk/orbital/orbital.vcxproj

    r1492 r1510  
    2828  </ItemGroup>
    2929  <ItemGroup>
    30     <ClInclude Include="generated\mesh-parser.h" />
    3130    <ClInclude Include="generated\gun-parser.h" />
    3231    <ClInclude Include="gun.h" />
    3332    <ClInclude Include="Lolnament.h" />
    34     <ClInclude Include="mesh-compiler.h" />
    3533    <ClInclude Include="gun-compiler.h" />
    36     <ClInclude Include="mesh.h" />
    3734    <ClInclude Include="orbital.h" />
    3835    <ClInclude Include="particlesystem.h" />
    … …  
    4340  </ItemGroup>
    4441  <ItemGroup>
    45     <ClCompile Include="generated\mesh-parser.cpp" />
    4642    <ClCompile Include="generated\gun-parser.cpp" />
    47     <ClCompile Include="generated\mesh-scanner.cpp" />
    4843    <ClCompile Include="generated\gun-scanner.cpp" />
    49     <ClCompile Include="mesh-compiler.cpp" />
    50     <ClCompile Include="mesh.cpp" />
     44    <ClCompile Include="generated\location.hh" />
     45    <ClCompile Include="generated\position.hh" />
     46    <ClCompile Include="generated\stack.hh" />
    5147    <ClCompile Include="gun-compiler.cpp" />
    5248    <ClCompile Include="gun.cpp" />
    5349    <ClCompile Include="orbital.cpp" />
    54   </ItemGroup>
    55   <ItemGroup>
    56     <LolFxCompile Include="shiny.lolfx" />
    5750  </ItemGroup>
    5851  <ItemGroup>
    … …  
    6255  </ItemGroup>
    6356  <ItemGroup>
    64     <None Include="generated\location.hh" />
    65     <None Include="generated\position.hh" />
    66     <None Include="generated\stack.hh" />
    67     <None Include="mesh-scanner.l" />
    6857    <None Include="gun-scanner.l" />
    69     <None Include="mesh-parser.y" />
    7058    <None Include="gun-parser.y" />
    7159  </ItemGroup>

  • trunk/orbital/orbital.vcxproj.filters

    r1492 r1510  
    33  <ItemGroup>
    44    <ClInclude Include="gun.h" />
    5     <ClInclude Include="mesh.h" />
    65    <ClInclude Include="player.h" />
    76    <ClInclude Include="tank.h" />
    87    <ClInclude Include="starfield.h" />
    98    <ClInclude Include="snake.h" />
    10     <ClInclude Include="mesh-compiler.h" />
    119    <ClInclude Include="gun-compiler.h" />
    12     <ClInclude Include="generated\mesh-parser.h">
    13       <Filter>generated</Filter>
    14     </ClInclude>
    1510    <ClInclude Include="generated\gun-parser.h">
    1611      <Filter>generated</Filter>
    … …  
    2621  <ItemGroup>
    2722    <ClCompile Include="orbital.cpp" />
    28     <ClCompile Include="mesh-compiler.cpp" />
    29     <ClCompile Include="mesh.cpp" />
    3023    <ClCompile Include="gun-compiler.cpp" />
    3124    <ClCompile Include="gun.cpp" />
    32     <ClCompile Include="generated\mesh-parser.cpp">
    33       <Filter>generated</Filter>
    34     </ClCompile>
    3525    <ClCompile Include="generated\gun-parser.cpp">
    36       <Filter>generated</Filter>
    37     </ClCompile>
    38     <ClCompile Include="generated\mesh-scanner.cpp">
    3926      <Filter>generated</Filter>
    4027    </ClCompile>
    … …  
    4229      <Filter>generated</Filter>
    4330    </ClCompile>
     31    <ClCompile Include="generated\location.hh">
     32      <Filter>generated</Filter>
     33    </ClCompile>
     34    <ClCompile Include="generated\position.hh">
     35      <Filter>generated</Filter>
     36    </ClCompile>
     37    <ClCompile Include="generated\stack.hh">
     38      <Filter>generated</Filter>
     39    </ClCompile>
    4440  </ItemGroup>
    4541  <ItemGroup>
    46     <LolFxCompile Include="shiny.lolfx" />
    47   </ItemGroup>
    48   <ItemGroup>
    49     <None Include="mesh-scanner.l" />
    5042    <None Include="gun-scanner.l" />
    51     <None Include="mesh-parser.y" />
    5243    <None Include="gun-parser.y" />
    53     <None Include="generated\location.hh">
    54       <Filter>generated</Filter>
    55     </None>
    56     <None Include="generated\position.hh">
    57       <Filter>generated</Filter>
    58     </None>
    59     <None Include="generated\stack.hh">
    60       <Filter>generated</Filter>
    61     </None>
    6244  </ItemGroup>
    6345  <ItemGroup>

  • trunk/orbital/particlesystem.h

    r1442 r1510  
    7272
    7373private:
    74     Mesh m_mesh;
     74    EasyMesh m_mesh;
    7575    Array<vec3, vec3, float> m_particles;
    7676    float m_angle;

  • trunk/orbital/player.h

    r1494 r1510  
    215215private:
    216216    int m_type;
    217     Mesh m_ship_mesh, m_option_mesh, m_laser_mesh, m_exhaust_mesh;
     217    EasyMesh m_ship_mesh, m_option_mesh, m_laser_mesh, m_exhaust_mesh;
    218218    Stick *m_stick;
    219219

  • trunk/orbital/snake.h

    r1494 r1510  
    181181
    182182private:
    183     Mesh m_head, m_body, m_tail;
     183    EasyMesh m_head, m_body, m_tail;
    184184    float m_steer;
    185185    /* List of nodes (position, self-rotation angle, life, damage) */

  • trunk/orbital/starfield.h

    r1446 r1510  
    7272
    7373private:
    74     Mesh m_mesh;
     74    EasyMesh m_mesh;
    7575    Array<vec3, vec3, float> m_stars;
    7676    bool m_ready;

  • trunk/orbital/tank.h

    r1494 r1510  
    7171
    7272private:
    73     Mesh m_body, m_turret;
     73    EasyMesh m_body, m_turret;
    7474    vec3 m_target;
    7575    float m_turret_angle;

  • trunk/src/Makefile.am

    r1479 r1510  
    1616    lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
    1717    \
     18    generated/location.hh generated/position.hh generated/stack.hh \
     19    \
    1820    application/application.cpp application/application.h \
    1921    eglapp.cpp eglapp.h \
     22    \
     23    easymesh/easymesh.cpp easymesh/easymesh.h \
     24    easymesh/shiny.lolfx \
     25    easymesh/easymesh-compiler.cpp easymesh/easymesh-compiler.h \
     26    generated/easymesh-parser.cpp generated/easymesh-parser.h \
     27    generated/easymesh-scanner.cpp \
    2028    \
    2129    $(ps3_sources) \
    … …  
    6068         echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@
    6169
     70if TRUE
     71generated: .FORCE
     72        $(MKDIR_P) generated
     73        rm -f generated/[a-zA-Z]*
     74        flex -o generated/easymesh-scanner.cpp easymesh/easymesh-scanner.l
     75        bison -o generated/easymesh-parser.cpp --defines=generated/easymesh-parser.h \
     76              -d -b generated/easymesh easymesh/easymesh-parser.y
     77.FORCE:
     78endif
     79
     80EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y
     81
    6282sdl_sources = \
    6383    image/codec/sdl-image.cpp \

  • trunk/src/core.h

    r1455 r1510  
    113113#include "image/image.h"
    114114#include "application/application.h"
     115#include "easymesh/easymesh.h"
    115116
    116117// Managers

  • trunk/src/easymesh/easymesh-parser.y

    r1509 r1510  
    11%{
    22//
    3 // Orbital
     3// Lol Engine
    44//
    5 // Copyright: (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
     5// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
     6//            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
    67//            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
    7 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
     8//   This program is free software; you can redistribute it and/or
     9//   modify it under the terms of the Do What The Fuck You Want To
     10//   Public License, Version 2, as published by Sam Hocevar. See
     11//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    812//
    913
    … …  
    1317
    1418#include "core.h"
    15 #include "loldebug.h"
    16 
    17 using namespace lol;
    18 
    19 #include "../mesh.h"
     19#include "easymesh/easymesh.h"
    2020
    2121#include <string>
     22
    2223%}
    2324
    … …  
    2627%defines
    2728%skeleton "lalr1.cc"
    28 %name-prefix="orbital"
    29 %define parser_class_name "MeshParser"
     29%name-prefix="lol"
     30%define parser_class_name "EasyMeshParser"
    3031%locations
    31 %parse-param { class MeshCompiler& mc }
     32%parse-param { class EasyMeshCompiler& mc }
    3233%error-verbose
    3334
    … …  
    6364
    6465%{
    65 #include "../mesh-compiler.h"
     66#include "easymesh/easymesh-compiler.h"
    6667
    6768#undef yylex
    … …  
    174175%%
    175176
    176 void orbital::MeshParser::error(const MeshParser::location_type& l,
     177void lol::EasyMeshParser::error(const EasyMeshParser::location_type& l,
    177178                                const std::string& m)
    178179{

  • trunk/src/easymesh/easymesh-scanner.l

    r1509 r1510  
    11%{
    22//
    3 // Orbital
     3// Lol Engine
    44//
    5 // Copyright: (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
     5// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
     6//            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
    67//            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
    7 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
     8//   This program is free software; you can redistribute it and/or
     9//   modify it under the terms of the Do What The Fuck You Want To
     10//   Public License, Version 2, as published by Sam Hocevar. See
     11//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    812//
    913
    … …  
    1317
    1418#include "core.h"
    15 #include "loldebug.h"
     19#include "easymesh/easymesh-compiler.h"
    1620
    17 using namespace lol;
    18 
    19 #include "../mesh-compiler.h"
    20 
    21 typedef orbital::MeshParser::token token;
    22 typedef orbital::MeshParser::token_type token_type;
     21typedef lol::EasyMeshParser::token token;
     22typedef lol::EasyMeshParser::token_type token_type;
    2323
    2424#ifndef YY_DECL
    25 #   define YY_DECL orbital::MeshParser::token_type \
    26         orbital::MeshScanner::lex(orbital::MeshParser::semantic_type* yylval, \
    27                                   orbital::MeshParser::location_type* yylloc)
     25#   define YY_DECL lol::EasyMeshParser::token_type \
     26        lol::EasyMeshScanner::lex(lol::EasyMeshParser::semantic_type* yylval, \
     27                                  lol::EasyMeshParser::location_type* yylloc)
    2828#endif
    2929
    … …  
    3333%}
    3434
    35 %option c++ prefix="Mesh"
     35%option c++ prefix="EasyMesh"
    3636%option batch yywrap nounput stack
    3737
    … …  
    109109%%
    110110
    111 orbital::MeshScanner::MeshScanner(char const *command)
    112     : MeshFlexLexer(0, 0),
     111lol::EasyMeshScanner::EasyMeshScanner(char const *command)
     112    : EasyMeshFlexLexer(0, 0),
    113113      m_input(command)
    114114{
    115115}
    116116
    117 orbital::MeshScanner::~MeshScanner()
     117lol::EasyMeshScanner::~EasyMeshScanner()
    118118{
    119119}
    120120
    121 int orbital::MeshScanner::LexerInput(char* buf, int max_size)
     121int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
    122122{
    123123    buf[0] = m_input[0];
    … …  
    130130#undef yylex
    131131#endif
    132 int MeshFlexLexer::yylex()
     132int EasyMeshFlexLexer::yylex()
    133133{
    134     std::cerr << "in MeshFlexLexer::yylex() !" << std::endl;
     134    std::cerr << "in EasyMeshFlexLexer::yylex() !" << std::endl;
    135135    return 0;
    136136}
    137137
    138 int MeshFlexLexer::yywrap()
     138int EasyMeshFlexLexer::yywrap()
    139139{
    140140    return 1;

  • trunk/src/generated/easymesh-parser.cpp

    r1509 r1510  
    3232
    3333// Take the name prefix into account.
    34 #define yylex   orbitallex
     34#define yylex   lollex
    3535
    3636/* First part of user declarations.  */
    3737
    3838/* Line 293 of lalr1.cc  */
    39 #line 1 "mesh-parser.y"
     39#line 1 "easymesh/easymesh-parser.y"
    4040
    4141//
    42 // Orbital
     42// Lol Engine
    4343//
    44 // Copyright: (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
     44// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
     45//            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
    4546//            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
    46 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
     47//   This program is free software; you can redistribute it and/or
     48//   modify it under the terms of the Do What The Fuck You Want To
     49//   Public License, Version 2, as published by Sam Hocevar. See
     50//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    4751//
    4852
    … …  
    5256
    5357#include "core.h"
    54 #include "loldebug.h"
    55 
    56 using namespace lol;
    57 
    58 #include "../mesh.h"
     58#include "easymesh/easymesh.h"
    5959
    6060#include <string>
    6161
    6262
     63
    6364/* Line 293 of lalr1.cc  */
    64 #line 65 "generated/mesh-parser.cpp"
    65 
    66 
    67 #include "mesh-parser.h"
     65#line 66 "generated/easymesh-parser.cpp"
     66
     67
     68#include "easymesh-parser.h"
    6869
    6970/* User implementation prologue.  */
    7071
    7172/* Line 299 of lalr1.cc  */
    72 #line 64 "mesh-parser.y"
    73 
    74 #include "../mesh-compiler.h"
     73#line 65 "easymesh/easymesh-parser.y"
     74
     75#include "easymesh/easymesh-compiler.h"
    7576
    7677#undef yylex
    … …  
    7980
    8081/* Line 299 of lalr1.cc  */
    81 #line 82 "generated/mesh-parser.cpp"
     82#line 83 "generated/easymesh-parser.cpp"
    8283
    8384#ifndef YY_
    … …  
    162163
    163164
    164 namespace orbital {
     165namespace lol {
    165166
    166167/* Line 382 of lalr1.cc  */
    167 #line 168 "generated/mesh-parser.cpp"
     168#line 169 "generated/easymesh-parser.cpp"
    168169
    169170  /* Return YYSTR after stripping away unnecessary quotes and
    … …  
    173174     YYSTR is taken from yytname.  */
    174175  std::string
    175   MeshParser::yytnamerr_ (const char *yystr)
     176  EasyMeshParser::yytnamerr_ (const char *yystr)
    176177  {
    177178    if (*yystr == '"')
    … …  
    206207
    207208  /// Build a parser object.
    208   MeshParser::MeshParser (class MeshCompiler& mc_yyarg)
     209  EasyMeshParser::EasyMeshParser (class EasyMeshCompiler& mc_yyarg)
    209210    :
    210211#if YYDEBUG
    … …  
    216217  }
    217218
    218   MeshParser::~MeshParser ()
     219  EasyMeshParser::~EasyMeshParser ()
    219220  {
    220221  }
    … …  
    226227
    227228  inline void
    228   MeshParser::yy_symbol_value_print_ (int yytype,
     229  EasyMeshParser::yy_symbol_value_print_ (int yytype,
    229230                           const semantic_type* yyvaluep, const location_type* yylocationp)
    230231  {
    … …  
    240241
    241242  void
    242   MeshParser::yy_symbol_print_ (int yytype,
     243  EasyMeshParser::yy_symbol_print_ (int yytype,
    243244                           const semantic_type* yyvaluep, const location_type* yylocationp)
    244245  {
    … …  
    252253
    253254  void
    254   MeshParser::yydestruct_ (const char* yymsg,
     255  EasyMeshParser::yydestruct_ (const char* yymsg,
    255256                           int yytype, semantic_type* yyvaluep, location_type* yylocationp)
    256257  {
    … …  
    270271
    271272  void
    272   MeshParser::yypop_ (unsigned int n)
     273  EasyMeshParser::yypop_ (unsigned int n)
    273274  {
    274275    yystate_stack_.pop (n);
    … …  
    279280#if YYDEBUG
    280281  std::ostream&
    281   MeshParser::debug_stream () const
     282  EasyMeshParser::debug_stream () const
    282283  {
    283284    return *yycdebug_;
    … …  
    285286
    286287  void
    287   MeshParser::set_debug_stream (std::ostream& o)
     288  EasyMeshParser::set_debug_stream (std::ostream& o)
    288289  {
    289290    yycdebug_ = &o;
    … …  
    291292
    292293
    293   MeshParser::debug_level_type
    294   MeshParser::debug_level () const
     294  EasyMeshParser::debug_level_type
     295  EasyMeshParser::debug_level () const
    295296  {
    296297    return yydebug_;
    … …  
    298299
    299300  void
    300   MeshParser::set_debug_level (debug_level_type l)
     301  EasyMeshParser::set_debug_level (debug_level_type l)
    301302  {
    302303    yydebug_ = l;
    … …  
    305306
    306307  inline bool
    307   MeshParser::yy_pact_value_is_default_ (int yyvalue)
     308  EasyMeshParser::yy_pact_value_is_default_ (int yyvalue)
    308309  {
    309310    return yyvalue == yypact_ninf_;
    … …  
    311312
    312313  inline bool
    313   MeshParser::yy_table_value_is_error_ (int yyvalue)
     314  EasyMeshParser::yy_table_value_is_error_ (int yyvalue)
    314315  {
    315316    return yyvalue == yytable_ninf_;
    … …  
    317318
    318319  int
    319   MeshParser::parse ()
     320  EasyMeshParser::parse ()
    320321  {
    321322    /// Lookahead and lookahead in internal form.
    … …  
    466467
    467468/* Line 690 of lalr1.cc  */
    468 #line 88 "mesh-parser.y"
     469#line 89 "easymesh/easymesh-parser.y"
    469470    { mc.m_mesh.OpenBrace(); }
    470471    break;
    … …  
    473474
    474475/* Line 690 of lalr1.cc  */
    475 #line 92 "mesh-parser.y"
     476#line 93 "easymesh/easymesh-parser.y"
    476477    { mc.m_mesh.CloseBrace(); }
    477478    break;
    … …  
    480481
    481482/* Line 690 of lalr1.cc  */
    482 #line 107 "mesh-parser.y"
     483#line 108 "easymesh/easymesh-parser.y"
    483484    { mc.m_mesh.SetCurColor(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
    484485    break;
    … …  
    487488
    488489/* Line 690 of lalr1.cc  */
    489 #line 108 "mesh-parser.y"
     490#line 109 "easymesh/easymesh-parser.y"
    490491    { uint32_t x = (yysemantic_stack_[(2) - (2)].u32val);
    491492                      vec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);
    … …  
    496497
    497498/* Line 690 of lalr1.cc  */
    498 #line 111 "mesh-parser.y"
     499#line 112 "easymesh/easymesh-parser.y"
    499500    { mc.m_mesh.SetCurColor2(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
    500501    break;
    … …  
    503504
    504505/* Line 690 of lalr1.cc  */
    505 #line 112 "mesh-parser.y"
     506#line 113 "easymesh/easymesh-parser.y"
    506507    { uint32_t x = (yysemantic_stack_[(2) - (2)].u32val);
    507508                      vec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);
    … …  
    512513
    513514/* Line 690 of lalr1.cc  */
    514 #line 118 "mesh-parser.y"
     515#line 119 "easymesh/easymesh-parser.y"
    515516    { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].args).f0); }
    516517    break;
    … …  
    519520
    520521/* Line 690 of lalr1.cc  */
    521 #line 119 "mesh-parser.y"
     522#line 120 "easymesh/easymesh-parser.y"
    522523    { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
    523524    break;
    … …  
    526527
    527528/* Line 690 of lalr1.cc  */
    528 #line 120 "mesh-parser.y"
     529#line 121 "easymesh/easymesh-parser.y"
    529530    { mc.m_mesh.Translate(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
    530531    break;
    … …  
    533534
    534535/* Line 690 of lalr1.cc  */
    535 #line 121 "mesh-parser.y"
     536#line 122 "easymesh/easymesh-parser.y"
    536537    { mc.m_mesh.Translate(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
    537538    break;
    … …  
    540541
    541542/* Line 690 of lalr1.cc  */
    542 #line 122 "mesh-parser.y"
     543#line 123 "easymesh/easymesh-parser.y"
    543544    { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    544545    break;
    … …  
    547548
    548549/* Line 690 of lalr1.cc  */
    549 #line 123 "mesh-parser.y"
     550#line 124 "easymesh/easymesh-parser.y"
    550551    { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].args).f0); }
    551552    break;
    … …  
    554555
    555556/* Line 690 of lalr1.cc  */
    556 #line 124 "mesh-parser.y"
     557#line 125 "easymesh/easymesh-parser.y"
    557558    { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].args).f0); }
    558559    break;
    … …  
    561562
    562563/* Line 690 of lalr1.cc  */
    563 #line 125 "mesh-parser.y"
     564#line 126 "easymesh/easymesh-parser.y"
    564565    { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].args).f0); }
    565566    break;
    … …  
    568569
    569570/* Line 690 of lalr1.cc  */
    570 #line 126 "mesh-parser.y"
     571#line 127 "easymesh/easymesh-parser.y"
    571572    { mc.m_mesh.TaperX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    572573    break;
    … …  
    575576
    576577/* Line 690 of lalr1.cc  */
    577 #line 127 "mesh-parser.y"
     578#line 128 "easymesh/easymesh-parser.y"
    578579    { mc.m_mesh.TaperY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    579580    break;
    … …  
    582583
    583584/* Line 690 of lalr1.cc  */
    584 #line 128 "mesh-parser.y"
     585#line 129 "easymesh/easymesh-parser.y"
    585586    { mc.m_mesh.TaperZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    586587    break;
    … …  
    589590
    590591/* Line 690 of lalr1.cc  */
    591 #line 129 "mesh-parser.y"
     592#line 130 "easymesh/easymesh-parser.y"
    592593    { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
    593594    break;
    … …  
    596597
    597598/* Line 690 of lalr1.cc  */
    598 #line 130 "mesh-parser.y"
     599#line 131 "easymesh/easymesh-parser.y"
    599600    { mc.m_mesh.Scale(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
    600601    break;
    … …  
    603604
    604605/* Line 690 of lalr1.cc  */
    605 #line 131 "mesh-parser.y"
     606#line 132 "easymesh/easymesh-parser.y"
    606607    { mc.m_mesh.Scale(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
    607608    break;
    … …  
    610611
    611612/* Line 690 of lalr1.cc  */
    612 #line 132 "mesh-parser.y"
     613#line 133 "easymesh/easymesh-parser.y"
    613614    { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    614615    break;
    … …  
    617618
    618619/* Line 690 of lalr1.cc  */
    619 #line 133 "mesh-parser.y"
     620#line 134 "easymesh/easymesh-parser.y"
    620621    { mc.m_mesh.MirrorX(); }
    621622    break;
    … …  
    624625
    625626/* Line 690 of lalr1.cc  */
    626 #line 134 "mesh-parser.y"
     627#line 135 "easymesh/easymesh-parser.y"
    627628    { mc.m_mesh.MirrorY(); }
    628629    break;
    … …  
    631632
    632633/* Line 690 of lalr1.cc  */
    633 #line 135 "mesh-parser.y"
     634#line 136 "easymesh/easymesh-parser.y"
    634635    { mc.m_mesh.MirrorZ(); }
    635636    break;
    … …  
    638639
    639640/* Line 690 of lalr1.cc  */
    640 #line 139 "mesh-parser.y"
     641#line 140 "easymesh/easymesh-parser.y"
    641642    { mc.m_mesh.AppendCylinder((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    642643                                                 (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
    … …  
    647648
    648649/* Line 690 of lalr1.cc  */
    649 #line 142 "mesh-parser.y"
     650#line 143 "easymesh/easymesh-parser.y"
    650651    { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    651652    break;
    … …  
    654655
    655656/* Line 690 of lalr1.cc  */
    656 #line 143 "mesh-parser.y"
     657#line 144 "easymesh/easymesh-parser.y"
    657658    { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    658659                                                            (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
    … …  
    662663
    663664/* Line 690 of lalr1.cc  */
    664 #line 145 "mesh-parser.y"
     665#line 146 "easymesh/easymesh-parser.y"
    665666    { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    666667                                                          (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
    … …  
    670671
    671672/* Line 690 of lalr1.cc  */
    672 #line 147 "mesh-parser.y"
     673#line 148 "easymesh/easymesh-parser.y"
    673674    { mc.m_mesh.AppendSphere((yysemantic_stack_[(2) - (2)].args).f0,
    674675                                               vec3((yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
    … …  
    678679
    679680/* Line 690 of lalr1.cc  */
    680 #line 149 "mesh-parser.y"
     681#line 150 "easymesh/easymesh-parser.y"
    681682    { mc.m_mesh.AppendStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2,
    682683                                             (int)(yysemantic_stack_[(2) - (2)].args).f3, (int)(yysemantic_stack_[(2) - (2)].args).f4); }
    … …  
    686687
    687688/* Line 690 of lalr1.cc  */
    688 #line 151 "mesh-parser.y"
     689#line 152 "easymesh/easymesh-parser.y"
    689690    { mc.m_mesh.AppendExpandedStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    690691                                                     (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
    … …  
    694695
    695696/* Line 690 of lalr1.cc  */
    696 #line 153 "mesh-parser.y"
     697#line 154 "easymesh/easymesh-parser.y"
    697698    { mc.m_mesh.AppendDisc((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (int)(yysemantic_stack_[(2) - (2)].args).f2); }
    698699    break;
    … …  
    701702
    702703/* Line 690 of lalr1.cc  */
    703 #line 154 "mesh-parser.y"
     704#line 155 "easymesh/easymesh-parser.y"
    704705    { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
    705706    break;
    … …  
    708709
    709710/* Line 690 of lalr1.cc  */
    710 #line 155 "mesh-parser.y"
     711#line 156 "easymesh/easymesh-parser.y"
    711712    { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
    712713    break;
    … …  
    715716
    716717/* Line 690 of lalr1.cc  */
    717 #line 156 "mesh-parser.y"
     718#line 157 "easymesh/easymesh-parser.y"
    718719    { mc.m_mesh.AppendCog((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
    719720                                            (yysemantic_stack_[(2) - (2)].args).f4, (yysemantic_stack_[(2) - (2)].args).f5, (yysemantic_stack_[(2) - (2)].args).f6, (int)(yysemantic_stack_[(2) - (2)].args).f7); }
    … …  
    723724
    724725/* Line 690 of lalr1.cc  */
    725 #line 160 "mesh-parser.y"
     726#line 161 "easymesh/easymesh-parser.y"
    726727    { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
    727728    break;
    … …  
    730731
    731732/* Line 690 of lalr1.cc  */
    732 #line 161 "mesh-parser.y"
     733#line 162 "easymesh/easymesh-parser.y"
    733734    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(2) - (2)].fval); }
    734735    break;
    … …  
    737738
    738739/* Line 690 of lalr1.cc  */
    739 #line 162 "mesh-parser.y"
     740#line 163 "easymesh/easymesh-parser.y"
    740741    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f2 = (yysemantic_stack_[(2) - (2)].fval); }
    741742    break;
    … …  
    744745
    745746/* Line 690 of lalr1.cc  */
    746 #line 163 "mesh-parser.y"
     747#line 164 "easymesh/easymesh-parser.y"
    747748    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f3 = (yysemantic_stack_[(2) - (2)].fval); }
    748749    break;
    … …  
    751752
    752753/* Line 690 of lalr1.cc  */
    753 #line 164 "mesh-parser.y"
     754#line 165 "easymesh/easymesh-parser.y"
    754755    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f4 = (yysemantic_stack_[(2) - (2)].fval); }
    755756    break;
    … …  
    758759
    759760/* Line 690 of lalr1.cc  */
    760 #line 165 "mesh-parser.y"
     761#line 166 "easymesh/easymesh-parser.y"
    761762    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f5 = (yysemantic_stack_[(2) - (2)].fval); }
    762763    break;
    … …  
    765766
    766767/* Line 690 of lalr1.cc  */
    767 #line 166 "mesh-parser.y"
     768#line 167 "easymesh/easymesh-parser.y"
    768769    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f6 = (yysemantic_stack_[(2) - (2)].fval); }
    769770    break;
    … …  
    772773
    773774/* Line 690 of lalr1.cc  */
    774 #line 167 "mesh-parser.y"
     775#line 168 "easymesh/easymesh-parser.y"
    775776    { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f7 = (yysemantic_stack_[(2) - (2)].fval); }
    776777    break;
    … …  
    779780
    780781/* Line 690 of lalr1.cc  */
    781 #line 170 "mesh-parser.y"
     782#line 171 "easymesh/easymesh-parser.y"
    782783    { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); }
    783784    break;
    … …  
    786787
    787788/* Line 690 of lalr1.cc  */
    788 #line 171 "mesh-parser.y"
     789#line 172 "easymesh/easymesh-parser.y"
    789790    { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); }
    790791    break;
    … …  
    793794
    794795/* Line 690 of lalr1.cc  */
    795 #line 796 "generated/mesh-parser.cpp"
     796#line 797 "generated/easymesh-parser.cpp"
    796797        default:
    797798          break;
    … …  
    971972  // Generate an error message.
    972973  std::string
    973   MeshParser::yysyntax_error_ (int yystate, int yytoken)
     974  EasyMeshParser::yysyntax_error_ (int yystate, int yytoken)
    974975  {
    975976    std::string yyres;
    … …  
    10671068  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    10681069     STATE-NUM.  */
    1069   const signed char MeshParser::yypact_ninf_ = -45;
     1070  const signed char EasyMeshParser::yypact_ninf_ = -45;
    10701071  const signed char
    1071   MeshParser::yypact_[] =
     1072  EasyMeshParser::yypact_[] =
    10721073  {
    10731074        34,   -29,    70,    -6,    -6,    -6,    -6,   -45,    -6,    -6,
    … …  
    10871088     default is an error.  */
    10881089  const unsigned char
    1089   MeshParser::yydefact_[] =
     1090  EasyMeshParser::yydefact_[] =
    10901091  {
    10911092         0,     0,     0,     0,     0,     0,     0,    33,     0,     0,
    … …  
    11031104  /* YYPGOTO[NTERM-NUM].  */
    11041105  const signed char
    1105   MeshParser::yypgoto_[] =
     1106  EasyMeshParser::yypgoto_[] =
    11061107  {
    11071108       -45,   -45,    -4,   -45,   -45,   -45,   -45,   -17,   -45,   -45,
    … …  
    11111112  /* YYDEFGOTO[NTERM-NUM].  */
    11121113  const signed char
    1113   MeshParser::yydefgoto_[] =
     1114  EasyMeshParser::yydefgoto_[] =
    11141115  {
    11151116        -1,    33,    34,    35,    36,    96,    37,    38,    39,    40,
    … …  
    11201121     positive, shift that token.  If negative, reduce the rule which
    11211122     number is the opposite.  If YYTABLE_NINF_, syntax error.  */
    1122   const signed char MeshParser::yytable_ninf_ = -1;
     1123  const signed char EasyMeshParser::yytable_ninf_ = -1;
    11231124  const unsigned char
    1124   MeshParser::yytable_[] =
     1125  EasyMeshParser::yytable_[] =
    11251126  {
    11261127        87,    88,    89,    90,    48,    51,    42,    43,    52,    53,
    … …  
    11411142  /* YYCHECK.  */
    11421143  const signed char
    1143   MeshParser::yycheck_[] =
     1144  EasyMeshParser::yycheck_[] =
    11441145  {
    11451146        44,    45,    46,    47,     1,     2,    35,    36,     3,     4,
    … …  
    11611162     symbol of state STATE-NUM.  */
    11621163  const unsigned char
    1163   MeshParser::yystos_[] =
     1164  EasyMeshParser::yystos_[] =
    11641165  {
    11651166         0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
    … …  
    11791180     to YYLEX-NUM.  */
    11801181  const unsigned short int
    1181   MeshParser::yytoken_number_[] =
     1182  EasyMeshParser::yytoken_number_[] =
    11821183  {
    11831184         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
    … …  
    11901191  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
    11911192  const unsigned char
    1192   MeshParser::yyr1_[] =
     1193  EasyMeshParser::yyr1_[] =
    11931194  {
    11941195         0,    40,    41,    42,    42,    43,    43,    44,    45,    46,
    … …  
    12021203  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
    12031204  const unsigned char
    1204   MeshParser::yyr2_[] =
     1205  EasyMeshParser::yyr2_[] =
    12051206  {
    12061207         0,     2,     2,     1,     2,     1,     3,     1,     1,     1,
    … …  
    12161217     First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
    12171218  const char*
    1218   const MeshParser::yytname_[] =
     1219  const EasyMeshParser::yytname_[] =
    12191220  {
    12201221    "T_END", "error", "$undefined", "T_COLOR", "T_BGCOLOR", "T_TRANSLATEX",
    … …  
    12351236#if YYDEBUG
    12361237  /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
    1237   const MeshParser::rhs_number_type
    1238   MeshParser::yyrhs_[] =
     1238  const EasyMeshParser::rhs_number_type
     1239  EasyMeshParser::yyrhs_[] =
    12391240  {
    12401241        41,     0,    -1,    42,     0,    -1,    43,    -1,    43,    42,
    … …  
    12591260     YYRHS.  */
    12601261  const unsigned char
    1261   MeshParser::yyprhs_[] =
     1262  EasyMeshParser::yyprhs_[] =
    12621263  {
    12631264         0,     0,     3,     6,     8,    11,    13,    17,    19,    21,
    … …  
    12711272  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
    12721273  const unsigned char
    1273   MeshParser::yyrline_[] =
    1274   {
    1275          0,    74,    74,    78,    79,    83,    84,    88,    92,    96,
    1276       97,   101,   102,   103,   107,   108,   111,   112,   118,   119,
    1277      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
    1278      130,   131,   132,   133,   134,   135,   139,   142,   143,   145,
    1279      147,   149,   151,   153,   154,   155,   156,   160,   161,   162,
    1280      163,   164,   165,   166,   167,   170,   171
     1274  EasyMeshParser::yyrline_[] =
     1275  {
     1276         0,    75,    75,    79,    80,    84,    85,    89,    93,    97,
     1277      98,   102,   103,   104,   108,   109,   112,   113,   119,   120,
     1278     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
     1279     131,   132,   133,   134,   135,   136,   140,   143,   144,   146,
     1280     148,   150,   152,   154,   155,   156,   157,   161,   162,   163,
     1281     164,   165,   166,   167,   168,   171,   172
    12811282  };
    12821283
    12831284  // Print the state stack on the debug stream.
    12841285  void
    1285   MeshParser::yystack_print_ ()
     1286  EasyMeshParser::yystack_print_ ()
    12861287  {
    12871288    *yycdebug_ << "Stack now";
    … …  
    12941295  // Report on the debug stream that the rule \a yyrule is going to be reduced.
    12951296  void
    1296   MeshParser::yy_reduce_print_ (int yyrule)
     1297  EasyMeshParser::yy_reduce_print_ (int yyrule)
    12971298  {
    12981299    unsigned int yylno = yyrline_[yyrule];
    … …  
    13111312
    13121313  /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
    1313   MeshParser::token_number_type
    1314   MeshParser::yytranslate_ (int t)
     1314  EasyMeshParser::token_number_type
     1315  EasyMeshParser::yytranslate_ (int t)
    13151316  {
    13161317    static
    … …  
    13551356  }
    13561357
    1357   const int MeshParser::yyeof_ = 0;
    1358   const int MeshParser::yylast_ = 126;
    1359   const int MeshParser::yynnts_ = 20;
    1360   const int MeshParser::yyempty_ = -2;
    1361   const int MeshParser::yyfinal_ = 82;
    1362   const int MeshParser::yyterror_ = 1;
    1363   const int MeshParser::yyerrcode_ = 256;
    1364   const int MeshParser::yyntokens_ = 40;
    1365 
    1366   const unsigned int MeshParser::yyuser_token_number_max_ = 291;
    1367   const MeshParser::token_number_type MeshParser::yyundef_token_ = 2;
    1368 
    1369 
    1370 } // orbital
     1358  const int EasyMeshParser::yyeof_ = 0;
     1359  const int EasyMeshParser::yylast_ = 126;
     1360  const int EasyMeshParser::yynnts_ = 20;
     1361  const int EasyMeshParser::yyempty_ = -2;
     1362  const int EasyMeshParser::yyfinal_ = 82;
     1363  const int EasyMeshParser::yyterror_ = 1;
     1364  const int EasyMeshParser::yyerrcode_ = 256;
     1365  const int EasyMeshParser::yyntokens_ = 40;
     1366
     1367  const unsigned int EasyMeshParser::yyuser_token_number_max_ = 291;
     1368  const EasyMeshParser::token_number_type EasyMeshParser::yyundef_token_ = 2;
     1369
     1370
     1371} // lol
    13711372
    13721373/* Line 1136 of lalr1.cc  */
    1373 #line 1374 "generated/mesh-parser.cpp"
     1374#line 1375 "generated/easymesh-parser.cpp"
    13741375
    13751376
    13761377/* Line 1138 of lalr1.cc  */
    1377 #line 174 "mesh-parser.y"
    1378 
    1379 
    1380 void orbital::MeshParser::error(const MeshParser::location_type& l,
     1378#line 175 "easymesh/easymesh-parser.y"
     1379
     1380
     1381void lol::EasyMeshParser::error(const EasyMeshParser::location_type& l,
    13811382                                const std::string& m)
    13821383{

  • trunk/src/generated/easymesh-parser.h

    r1509 r1510  
    6262
    6363
    64 namespace orbital {
     64namespace lol {
    6565
    6666/* Line 35 of lalr1.cc  */
    67 #line 68 "generated/mesh-parser.h"
     67#line 68 "generated/easymesh-parser.h"
    6868
    6969  /// A Bison parser.
    70   class MeshParser
     70  class EasyMeshParser
    7171  {
    7272  public:
    … …  
    7777
    7878/* Line 35 of lalr1.cc  */
    79 #line 35 "mesh-parser.y"
     79#line 36 "easymesh/easymesh-parser.y"
    8080
    8181    float fval;
    … …  
    8787
    8888/* Line 35 of lalr1.cc  */
    89 #line 90 "generated/mesh-parser.h"
     89#line 90 "generated/easymesh-parser.h"
    9090    };
    9191#else
    … …  
    141141
    142142    /// Build a parser object.
    143     MeshParser (class MeshCompiler& mc_yyarg);
    144     virtual ~MeshParser ();
     143    EasyMeshParser (class EasyMeshCompiler& mc_yyarg);
     144    virtual ~EasyMeshParser ();
    145145
    146146    /// Parse.
    … …  
    307307
    308308    /* User arguments.  */
    309     class MeshCompiler& mc;
     309    class EasyMeshCompiler& mc;
    310310  };
    311311
    312 } // orbital
     312} // lol
    313313
    314314/* Line 35 of lalr1.cc  */
    315 #line 316 "generated/mesh-parser.h"
     315#line 316 "generated/easymesh-parser.h"
    316316
    317317

  • trunk/src/generated/easymesh-scanner.cpp

    r1509 r1510  
    1 #line 2 "generated/mesh-scanner.cpp"
    2 
    3 #line 4 "generated/mesh-scanner.cpp"
     1#line 2 "generated/easymesh-scanner.cpp"
     2
     3#line 4 "generated/easymesh-scanner.cpp"
    44
    55#define  YY_INT_ALIGNED short int
    … …  
    2121     * altogether.
    2222     */
    23     #define yyFlexLexer MeshFlexLexer
     23    #define yyFlexLexer EasyMeshFlexLexer
    2424
    2525/* First, we deal with  platform-specific or compiler-specific issues. */
    … …  
    285285#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
    286286
    287 void *Meshalloc (yy_size_t  );
    288 void *Meshrealloc (void *,yy_size_t  );
    289 void Meshfree (void *  );
     287void *EasyMeshalloc (yy_size_t  );
     288void *EasyMeshrealloc (void *,yy_size_t  );
     289void EasyMeshfree (void *  );
    290290
    291291#define yy_new_buffer yy_create_buffer
    … …  
    457457#define YY_MORE_ADJ 0
    458458#define YY_RESTORE_YY_MORE_OFFSET
    459 #line 1 "mesh-scanner.l"
    460 #line 2 "mesh-scanner.l"
     459#line 1 "easymesh/easymesh-scanner.l"
     460#line 2 "easymesh/easymesh-scanner.l"
    461461//
    462 // Orbital
     462// Lol Engine
    463463//
    464 // Copyright: (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
     464// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
     465//            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
    465466//            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
    466 //            (c) 2012 Sam Hocevar <sam@hocevar.net>
     467//   This program is free software; you can redistribute it and/or
     468//   modify it under the terms of the Do What The Fuck You Want To
     469//   Public License, Version 2, as published by Sam Hocevar. See
     470//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    467471//
    468472
    … …  
    472476
    473477#include "core.h"
    474 #include "loldebug.h"
    475 
    476 using namespace lol;
    477 
    478 #include "../mesh-compiler.h"
    479 
    480 typedef orbital::MeshParser::token token;
    481 typedef orbital::MeshParser::token_type token_type;
     478#include "easymesh/easymesh-compiler.h"
     479
     480typedef lol::EasyMeshParser::token token;
     481typedef lol::EasyMeshParser::token_type token_type;
    482482
    483483#ifndef YY_DECL
    484 #   define YY_DECL orbital::MeshParser::token_type \
    485         orbital::MeshScanner::lex(orbital::MeshParser::semantic_type* yylval, \
    486                                   orbital::MeshParser::location_type* yylloc)
     484#   define YY_DECL lol::EasyMeshParser::token_type \
     485        lol::EasyMeshScanner::lex(lol::EasyMeshParser::semantic_type* yylval, \
     486                                  lol::EasyMeshParser::location_type* yylloc)
    487487#endif
    488488
    … …  
    490490#define YY_NO_UNISTD_H
    491491#define YY_USER_ACTION yylloc->columns(yyleng);
    492 #line 493 "generated/mesh-scanner.cpp"
     492#line 493 "generated/easymesh-scanner.cpp"
    493493
    494494#define INITIAL 0
    … …  
    595595        register int yy_act;
    596596   
    597 #line 38 "mesh-scanner.l"
     597#line 38 "easymesh/easymesh-scanner.l"
    598598
    599599
    … …  
    603603
    604604
    605 #line 606 "generated/mesh-scanner.cpp"
     605#line 606 "generated/easymesh-scanner.cpp"
    606606
    607607        if ( !(yy_init) )
    … …  
    684684case 1:
    685685YY_RULE_SETUP
    686 #line 45 "mesh-scanner.l"
     686#line 45 "easymesh/easymesh-scanner.l"
    687687{ return token::T_COLOR; }
    688688        YY_BREAK
    689689case 2:
    690690YY_RULE_SETUP
    691 #line 46 "mesh-scanner.l"
     691#line 46 "easymesh/easymesh-scanner.l"
    692692{ return token::T_BGCOLOR; }
    693693        YY_BREAK
    694694case 3:
    695695YY_RULE_SETUP
    696 #line 48 "mesh-scanner.l"
     696#line 48 "easymesh/easymesh-scanner.l"
    697697{ return token::T_CHAMFER; }
    698698        YY_BREAK
    699699case 4:
    700700YY_RULE_SETUP
    701 #line 49 "mesh-scanner.l"
     701#line 49 "easymesh/easymesh-scanner.l"
    702702{ return token::T_TRANSLATEX; }
    703703        YY_BREAK
    704704case 5:
    705705YY_RULE_SETUP
    706 #line 50 "mesh-scanner.l"
     706#line 50 "easymesh/easymesh-scanner.l"
    707707{ return token::T_TRANSLATEY; }
    708708        YY_BREAK
    709709case 6:
    710710YY_RULE_SETUP
    711 #line 51 "mesh-scanner.l"
     711#line 51 "easymesh/easymesh-scanner.l"
    712712{ return token::T_TRANSLATEZ; }
    713713        YY_BREAK
    714714case 7:
    715715YY_RULE_SETUP
    716 #line 52 "mesh-scanner.l"
     716#line 52 "easymesh/easymesh-scanner.l"
    717717{ return token::T_TRANSLATE; }
    718718        YY_BREAK
    719719case 8:
    720720YY_RULE_SETUP
    721 #line 53 "mesh-scanner.l"
     721#line 53 "easymesh/easymesh-scanner.l"
    722722{ return token::T_ROTATEX; }
    723723        YY_BREAK
    724724case 9:
    725725YY_RULE_SETUP
    726 #line 54 "mesh-scanner.l"
     726#line 54 "easymesh/easymesh-scanner.l"
    727727{ return token::T_ROTATEY; }
    728728        YY_BREAK
    729729case 10:
    730730YY_RULE_SETUP
    731 #line 55 "mesh-scanner.l"
     731#line 55 "easymesh/easymesh-scanner.l"
    732732{ return token::T_ROTATEZ; }
    733733        YY_BREAK
    734734case 11:
    735735YY_RULE_SETUP
    736 #line 56 "mesh-scanner.l"
     736#line 56 "easymesh/easymesh-scanner.l"
    737737{ return token::T_TAPERX; }
    738738        YY_BREAK
    739739case 12:
    740740YY_RULE_SETUP
    741 #line 57 "mesh-scanner.l"
     741#line 57 "easymesh/easymesh-scanner.l"
    742742{ return token::T_TAPERY; }
    743743        YY_BREAK
    744744case 13:
    745745YY_RULE_SETUP
    746 #line 58 "mesh-scanner.l"
     746#line 58 "easymesh/easymesh-scanner.l"
    747747{ return token::T_TAPERZ; }
    748748        YY_BREAK
    749749case 14:
    750750YY_RULE_SETUP
    751 #line 59 "mesh-scanner.l"
     751#line 59 "easymesh/easymesh-scanner.l"
    752752{ return token::T_SCALEX; }
    753753        YY_BREAK
    754754case 15:
    755755YY_RULE_SETUP
    756 #line 60 "mesh-scanner.l"
     756#line 60 "easymesh/easymesh-scanner.l"
    757757{ return token::T_SCALEY; }
    758758        YY_BREAK
    759759case 16:
    760760YY_RULE_SETUP
    761 #line 61 "mesh-scanner.l"
     761#line 61 "easymesh/easymesh-scanner.l"
    762762{ return token::T_SCALEZ; }
    763763        YY_BREAK
    764764case 17:
    765765YY_RULE_SETUP
    766 #line 62 "mesh-scanner.l"
     766#line 62 "easymesh/easymesh-scanner.l"
    767767{ return token::T_SCALE; }
    768768        YY_BREAK
    769769case 18:
    770770YY_RULE_SETUP
    771 #line 63 "mesh-scanner.l"
     771#line 63 "easymesh/easymesh-scanner.l"
    772772{ return token::T_MIRRORX; }
    773773        YY_BREAK
    774774case 19:
    775775YY_RULE_SETUP
    776 #line 64 "mesh-scanner.l"
     776#line 64 "easymesh/easymesh-scanner.l"
    777777{ return token::T_MIRRORY; }
    778778        YY_BREAK
    779779case 20:
    780780YY_RULE_SETUP
    781 #line 65 "mesh-scanner.l"
     781#line 65 "easymesh/easymesh-scanner.l"
    782782{ return token::T_MIRRORZ; }
    783783        YY_BREAK
    784784case 21:
    785785YY_RULE_SETUP
    786 #line 67 "mesh-scanner.l"
     786#line 67 "easymesh/easymesh-scanner.l"
    787787{ return token::T_CYLINDER; }
    788788        YY_BREAK
    789789case 22:
    790790YY_RULE_SETUP
    791 #line 68 "mesh-scanner.l"
     791#line 68 "easymesh/easymesh-scanner.l"
    792792{ return token::T_BOX; }
    793793        YY_BREAK
    794794case 23:
    795795YY_RULE_SETUP
    796 #line 69 "mesh-scanner.l"
     796#line 69 "easymesh/easymesh-scanner.l"
    797797{ return token::T_SMOOTHCHAMFBOX; }
    798798        YY_BREAK
    799799case 24:
    800800YY_RULE_SETUP
    801 #line 70 "mesh-scanner.l"
     801#line 70 "easymesh/easymesh-scanner.l"
    802802{ return token::T_FLATCHAMFBOX; }
    803803        YY_BREAK
    804804case 25:
    805805YY_RULE_SETUP
    806 #line 71 "mesh-scanner.l"
     806#line 71 "easymesh/easymesh-scanner.l"
    807807{ return token::T_SPHERE; }
    808808        YY_BREAK
    809809case 26:
    810810YY_RULE_SETUP
    811 #line 72 "mesh-scanner.l"
     811#line 72 "easymesh/easymesh-scanner.l"
    812812{ return token::T_STAR; }
    813813        YY_BREAK
    814814case 27:
    815815YY_RULE_SETUP
    816 #line 73 "mesh-scanner.l"
     816#line 73 "easymesh/easymesh-scanner.l"
    817817{ return token::T_EXPANDEDSTAR; }
    818818        YY_BREAK
    819819case 28:
    820820YY_RULE_SETUP
    821 #line 74 "mesh-scanner.l"
     821#line 74 "easymesh/easymesh-scanner.l"
    822822{ return token::T_DISC; }
    823823        YY_BREAK
    824824case 29:
    825825YY_RULE_SETUP
    826 #line 75 "mesh-scanner.l"
     826#line 75 "easymesh/easymesh-scanner.l"
    827827{ return token::T_TRIANGLE; }
    828828        YY_BREAK
    829829case 30:
    830830YY_RULE_SETUP
    831 #line 76 "mesh-scanner.l"
     831#line 76 "easymesh/easymesh-scanner.l"
    832832{ return token::T_QUAD; }
    833833        YY_BREAK
    834834case 31:
    835835YY_RULE_SETUP
    836 #line 77 "mesh-scanner.l"
     836#line 77 "easymesh/easymesh-scanner.l"
    837837{ return token::T_COG; }
    838838        YY_BREAK
    839839case 32:
    840840YY_RULE_SETUP
    841 #line 79 "mesh-scanner.l"
     841#line 79 "easymesh/easymesh-scanner.l"
    842842{
    843843        uint32_t tmp = strtol(yytext + 1, NULL, 16);
    … …  
    850850case 33:
    851851YY_RULE_SETUP
    852 #line 86 "mesh-scanner.l"
     852#line 86 "easymesh/easymesh-scanner.l"
    853853{
    854854        uint32_t tmp = strtol(yytext + 1, NULL, 16);
    … …  
    861861case 34:
    862862YY_RULE_SETUP
    863 #line 93 "mesh-scanner.l"
     863#line 93 "easymesh/easymesh-scanner.l"
    864864{
    865865        yylval->u32val = 0xffu
    … …  
    869869case 35:
    870870YY_RULE_SETUP
    871 #line 97 "mesh-scanner.l"
     871#line 97 "easymesh/easymesh-scanner.l"
    872872{
    873873        yylval->u32val = (uint32_t)strtol(yytext + 1, NULL, 16);
    … …  
    876876case 36:
    877877YY_RULE_SETUP
    878 #line 100 "mesh-scanner.l"
     878#line 100 "easymesh/easymesh-scanner.l"
    879879{
    880880        yylval->fval = atof(yytext); return token::NUMBER; }
    … …  
    882882case 37:
    883883YY_RULE_SETUP
    884 #line 102 "mesh-scanner.l"
     884#line 102 "easymesh/easymesh-scanner.l"
    885885{ return token_type('-'); }
    886886        YY_BREAK
    887887case 38:
    888888YY_RULE_SETUP
    889 #line 103 "mesh-scanner.l"
     889#line 103 "easymesh/easymesh-scanner.l"
    890890{ return token_type('['); }
    891891        YY_BREAK
    892892case 39:
    893893YY_RULE_SETUP
    894 #line 104 "mesh-scanner.l"
     894#line 104 "easymesh/easymesh-scanner.l"
    895895{ return token_type(']'); }
    896896        YY_BREAK
    897897case 40:
    898898YY_RULE_SETUP
    899 #line 105 "mesh-scanner.l"
     899#line 105 "easymesh/easymesh-scanner.l"
    900900{ /* ignore this */ }
    901901        YY_BREAK
    … …  
    903903/* rule 41 can match eol */
    904904YY_RULE_SETUP
    905 #line 106 "mesh-scanner.l"
     905#line 106 "easymesh/easymesh-scanner.l"
    906906{ /* ignore this */ }
    907907        YY_BREAK
    908908case 42:
    909909YY_RULE_SETUP
    910 #line 107 "mesh-scanner.l"
     910#line 107 "easymesh/easymesh-scanner.l"
    911911{ return token::T_ERROR; }
    912912        YY_BREAK
    913913case 43:
    914914YY_RULE_SETUP
    915 #line 109 "mesh-scanner.l"
     915#line 109 "easymesh/easymesh-scanner.l"
    916916ECHO;
    917917        YY_BREAK
    918 #line 919 "generated/mesh-scanner.cpp"
     918#line 919 "generated/easymesh-scanner.cpp"
    919919case YY_STATE_EOF(INITIAL):
    920920        yyterminate();
    … …  
    10851085{
    10861086        delete [] yy_state_buf;
    1087         Meshfree(yy_start_stack  );
     1087        EasyMeshfree(yy_start_stack  );
    10881088        yy_delete_buffer( YY_CURRENT_BUFFER );
    1089         Meshfree(yy_buffer_stack  );
     1089        EasyMeshfree(yy_buffer_stack  );
    10901090}
    10911091
    … …  
    12151215                                b->yy_ch_buf = (char *)
    12161216                                        /* Include room in for 2 EOB chars. */
    1217                                         Meshrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
     1217                                        EasyMeshrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
    12181218                                }
    12191219                        else
    … …  
    12641264                /* Extend the array by 50%, plus the number we really need. */
    12651265                yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
    1266                 YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) Meshrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
     1266                YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) EasyMeshrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
    12671267                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
    12681268                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
    … …  
    15101510        YY_BUFFER_STATE b;
    15111511   
    1512         b = (YY_BUFFER_STATE) Meshalloc(sizeof( struct yy_buffer_state )  );
     1512        b = (YY_BUFFER_STATE) EasyMeshalloc(sizeof( struct yy_buffer_state )  );
    15131513        if ( ! b )
    15141514                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
    … …  
    15191519         * we need to put in 2 end-of-buffer characters.
    15201520         */
    1521         b->yy_ch_buf = (char *) Meshalloc(b->yy_buf_size + 2  );
     1521        b->yy_ch_buf = (char *) EasyMeshalloc(b->yy_buf_size + 2  );
    15221522        if ( ! b->yy_ch_buf )
    15231523                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
    … …  
    15441544
    15451545        if ( b->yy_is_our_buffer )
    1546                 Meshfree((void *) b->yy_ch_buf  );
    1547 
    1548         Meshfree((void *) b  );
     1546                EasyMeshfree((void *) b->yy_ch_buf  );
     1547
     1548        EasyMeshfree((void *) b  );
    15491549}
    15501550
    … …  
    16711671         */
    16721672                num_to_alloc = 1;
    1673                 (yy_buffer_stack) = (struct yy_buffer_state**)Meshalloc
     1673                (yy_buffer_stack) = (struct yy_buffer_state**)EasyMeshalloc
    16741674                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
    16751675                                                                );
    … …  
    16901690
    16911691                num_to_alloc = (yy_buffer_stack_max) + grow_size;
    1692                 (yy_buffer_stack) = (struct yy_buffer_state**)Meshrealloc
     1692                (yy_buffer_stack) = (struct yy_buffer_state**)EasyMeshrealloc
    16931693                                                                ((yy_buffer_stack),
    16941694                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
    … …  
    17131713
    17141714                if ( ! (yy_start_stack) )
    1715                         (yy_start_stack) = (int *) Meshalloc(new_size  );
     1715                        (yy_start_stack) = (int *) EasyMeshalloc(new_size  );
    17161716
    17171717                else
    1718                         (yy_start_stack) = (int *) Meshrealloc((void *) (yy_start_stack),new_size  );
     1718                        (yy_start_stack) = (int *) EasyMeshrealloc((void *) (yy_start_stack),new_size  );
    17191719
    17201720                if ( ! (yy_start_stack) )
    … …  
    17931793#endif
    17941794
    1795 void *Meshalloc (yy_size_t  size )
     1795void *EasyMeshalloc (yy_size_t  size )
    17961796{
    17971797        return (void *) malloc( size );
    17981798}
    17991799
    1800 void *Meshrealloc  (void * ptr, yy_size_t  size )
     1800void *EasyMeshrealloc  (void * ptr, yy_size_t  size )
    18011801{
    18021802        /* The cast to (char *) in the following accommodates both
    … …  
    18101810}
    18111811
    1812 void Meshfree (void * ptr )
    1813 {
    1814         free( (char *) ptr );   /* see Meshrealloc() for (char *) cast */
     1812void EasyMeshfree (void * ptr )
     1813{
     1814        free( (char *) ptr );   /* see EasyMeshrealloc() for (char *) cast */
    18151815}
    18161816
    18171817#define YYTABLES_NAME "yytables"
    18181818
    1819 #line 109 "mesh-scanner.l"
    1820 
    1821 
    1822 
    1823 orbital::MeshScanner::MeshScanner(char const *command)
    1824     : MeshFlexLexer(0, 0),
     1819#line 109 "easymesh/easymesh-scanner.l"
     1820
     1821
     1822
     1823lol::EasyMeshScanner::EasyMeshScanner(char const *command)
     1824    : EasyMeshFlexLexer(0, 0),
    18251825      m_input(command)
    18261826{
    18271827}
    18281828
    1829 orbital::MeshScanner::~MeshScanner()
    1830 {
    1831 }
    1832 
    1833 int orbital::MeshScanner::LexerInput(char* buf, int max_size)
     1829lol::EasyMeshScanner::~EasyMeshScanner()
     1830{
     1831}
     1832
     1833int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
    18341834{
    18351835    buf[0] = m_input[0];
    … …  
    18421842#undef yylex
    18431843#endif
    1844 int MeshFlexLexer::yylex()
    1845 {
    1846     std::cerr << "in MeshFlexLexer::yylex() !" << std::endl;
     1844int EasyMeshFlexLexer::yylex()
     1845{
     1846    std::cerr << "in EasyMeshFlexLexer::yylex() !" << std::endl;
    18471847    return 0;
    18481848}
    18491849
    1850 int MeshFlexLexer::yywrap()
     1850int EasyMeshFlexLexer::yywrap()
    18511851{
    18521852    return 1;

  • trunk/win32/lolcore.vcxproj

    r1457 r1510  
    8282    <ClCompile Include="..\src\debug\stats.cpp" />
    8383    <ClCompile Include="..\src\dict.cpp" />
     84    <ClCompile Include="..\src\easymesh\easymesh-compiler.cpp" />
     85    <ClCompile Include="..\src\easymesh\easymesh.cpp" />
    8486    <ClCompile Include="..\src\eglapp.cpp" />
    8587    <ClCompile Include="..\src\emitter.cpp" />
    … …  
    8789    <ClCompile Include="..\src\font.cpp" />
    8890    <ClCompile Include="..\src\forge.cpp" />
     91    <ClCompile Include="..\src\generated\easymesh-parser.cpp" />
     92    <ClCompile Include="..\src\generated\easymesh-scanner.cpp" />
    8993    <ClCompile Include="..\src\gpu\framebuffer.cpp" />
    9094    <ClCompile Include="..\src\gpu\indexbuffer.cpp" />
    … …  
    142146    <ClInclude Include="..\src\debug\stats.h" />
    143147    <ClInclude Include="..\src\dict.h" />
     148    <ClInclude Include="..\src\easymesh\easymesh-compiler.h" />
     149    <ClInclude Include="..\src\easymesh\easymesh.h" />
    144150    <ClInclude Include="..\src\eglapp.h" />
    145151    <ClInclude Include="..\src\emitter.h" />
    … …  
    147153    <ClInclude Include="..\src\font.h" />
    148154    <ClInclude Include="..\src\forge.h" />
     155    <ClInclude Include="..\src\generated\easymesh-parser.h" />
     156    <ClInclude Include="..\src\generated\location.hh" />
     157    <ClInclude Include="..\src\generated\position.hh" />
     158    <ClInclude Include="..\src\generated\stack.hh" />
    149159    <ClInclude Include="..\src\gpu\framebuffer.h" />
    150160    <ClInclude Include="..\src\gpu\indexbuffer.h" />
    … …  
    194204  </ItemGroup>
    195205  <ItemGroup>
     206    <LolFxCompile Include="..\src\easymesh\shiny.lolfx" />
    196207    <LolFxCompile Include="..\src\gpu\defaultmaterial.lolfx" />
    197208    <LolFxCompile Include="..\src\gpu\emptymaterial.lolfx" />
    198209    <LolFxCompile Include="..\src\gpu\testmaterial.lolfx" />
     210  </ItemGroup>
     211  <ItemGroup>
     212    <None Include="..\src\easymesh\easymesh-parser.y" />
     213    <None Include="..\src\easymesh\easymesh-scanner.l" />
    199214  </ItemGroup>
    200215  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/win32/lolcore.vcxproj.filters

    r1457 r1510  
    5151      <UniqueIdentifier>{3592ed6a-59d7-4a6d-be5a-c05cb5dab730}</UniqueIdentifier>
    5252    </Filter>
     53    <Filter Include="src\generated">
     54      <UniqueIdentifier>{8d536fa6-9ef8-4bdb-b945-48fe4549e8ec}</UniqueIdentifier>
     55    </Filter>
     56    <Filter Include="src\easymesh">
     57      <UniqueIdentifier>{07117029-d79d-4d59-beec-691b00a97c8f}</UniqueIdentifier>
     58    </Filter>
    5359  </ItemGroup>
    5460  <ItemGroup>
    … …  
    218224      <Filter>src\gpu</Filter>
    219225    </ClCompile>
     226    <ClCompile Include="..\src\easymesh\easymesh.cpp">
     227      <Filter>src\easymesh</Filter>
     228    </ClCompile>
     229    <ClCompile Include="..\src\easymesh\easymesh-compiler.cpp">
     230      <Filter>src\easymesh</Filter>
     231    </ClCompile>
     232    <ClCompile Include="..\src\generated\easymesh-parser.cpp">
     233      <Filter>src\generated</Filter>
     234    </ClCompile>
     235    <ClCompile Include="..\src\generated\easymesh-scanner.cpp">
     236      <Filter>src\generated</Filter>
     237    </ClCompile>
    220238  </ItemGroup>
    221239  <ItemGroup>
    … …  
    406424      <Filter>src\gpu</Filter>
    407425    </ClInclude>
     426    <ClInclude Include="..\src\generated\position.hh">
     427      <Filter>src\generated</Filter>
     428    </ClInclude>
     429    <ClInclude Include="..\src\generated\location.hh">
     430      <Filter>src\generated</Filter>
     431    </ClInclude>
     432    <ClInclude Include="..\src\generated\stack.hh">
     433      <Filter>src\generated</Filter>
     434    </ClInclude>
     435    <ClInclude Include="..\src\easymesh\easymesh.h">
     436      <Filter>src\easymesh</Filter>
     437    </ClInclude>
     438    <ClInclude Include="..\src\easymesh\easymesh-compiler.h">
     439      <Filter>src\easymesh</Filter>
     440    </ClInclude>
     441    <ClInclude Include="..\src\generated\easymesh-parser.h">
     442      <Filter>src\generated</Filter>
     443    </ClInclude>
    408444  </ItemGroup>
    409445  <ItemGroup>
    … …  
    417453      <Filter>src\gpu</Filter>
    418454    </LolFxCompile>
     455    <LolFxCompile Include="..\src\easymesh\shiny.lolfx">
     456      <Filter>src\easymesh</Filter>
     457    </LolFxCompile>
     458  </ItemGroup>
     459  <ItemGroup>
     460    <None Include="..\src\easymesh\easymesh-parser.y">
     461      <Filter>src\easymesh</Filter>
     462    </None>
     463    <None Include="..\src\easymesh\easymesh-scanner.l">
     464      <Filter>src\easymesh</Filter>
     465    </None>
    419466  </ItemGroup>
    420467</Project>
Note: See TracChangeset for help on using the changeset viewer.